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.125 by root, Sun Nov 21 19:04:07 2004 UTC vs.
Revision 1.179 by root, Mon Jan 2 15:10:18 2006 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
28#endif
23 29
24/* 30/*
25 ***************************************************************************** 31 *****************************************************************************
26 * SYSTEM HACKS 32 * SYSTEM HACKS
27 ***************************************************************************** 33 *****************************************************************************
… …
66# define STDIN_FILENO 0 72# define STDIN_FILENO 0
67# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
68# define STDERR_FILENO 2 74# define STDERR_FILENO 2
69#endif 75#endif
70 76
71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
73# define NO_SETOWNER_TTYDEV 1
74# endif
75#endif
76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
77# define NO_SETOWNER_TTYDEV 1
78#endif
79
80/* 77/*
81 ***************************************************************************** 78 *****************************************************************************
82 * PROTOTYPES 79 * PROTOTYPES
83 ***************************************************************************** 80 *****************************************************************************
84 */ 81 */
82// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 83RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 84RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 85void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 86void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 87void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 88void * rxvt_realloc (void *ptr, size_t size);
89void rxvt_privileges (rxvt_privaction action);
90
91// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len); 92char * rxvt_wcstombs (const wchar_t *str, int len = -1);
93wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
94char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
95wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
92char * rxvt_strdup (const char *str); 96char * rxvt_strdup (const char *str);
97
98// misc.C
93char * rxvt_r_basename (const char *str); 99char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr); 100void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...); 101void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...); 102void rxvt_warn (const char *fmt,...);
97void rxvt_fatal (const char *fmt,...); 103void rxvt_fatal (const char *fmt,...);
… …
103char ** rxvt_splitcommastring (const char *cs); 109char ** rxvt_splitcommastring (const char *cs);
104void rxvt_freecommastring (char **cs); 110void rxvt_freecommastring (char **cs);
105char * rxvt_File_find (const char *file, const char *ext, const char *path); 111char * rxvt_File_find (const char *file, const char *ext, const char *path);
106void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
107void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
108 114void rxvt_usleep (int usecs);
109void rxvt_privileges (rxvt_privaction action);
110 115
111/* 116/*
112 ***************************************************************************** 117 *****************************************************************************
113 * STRUCTURES AND TYPEDEFS 118 * STRUCTURES AND TYPEDEFS
114 ***************************************************************************** 119 *****************************************************************************
… …
124#endif 129#endif
125 130
126/* If we're using either the rxvt scrollbar or menu bars, keep the 131/* If we're using either the rxvt scrollbar or menu bars, keep the
127 * scrollColor resource. 132 * scrollColor resource.
128 */ 133 */
129#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 134#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
130# define KEEP_SCROLLCOLOR 1 135# define KEEP_SCROLLCOLOR 1
131#else 136#else
132# undef KEEP_SCROLLCOLOR 137# undef KEEP_SCROLLCOLOR
133#endif 138#endif
134 139
135#ifdef XPM_BACKGROUND 140#ifdef XPM_BACKGROUND
136typedef struct { 141typedef struct {
137 short w, h, x, y; 142 short w, h, x, y;
138 Pixmap pixmap; 143 Pixmap pixmap;
139} bgPixmap_t; 144} bgPixmap_t;
140#endif 145#endif
141 146
142/* 147/*
143 * the 'essential' information for reporting Mouse Events 148 * the 'essential' information for reporting Mouse Events
144 * pared down from XButtonEvent 149 * pared down from XButtonEvent
145 */ 150 */
146struct mouse_event { 151struct mouse_event {
147 int clicks; 152 int clicks;
148 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
149 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
150 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
151}; 156};
152
153#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
154#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
155#define SWAP_IT(one, two, typeof) \
156 do { \
157 typeof swapittmp; \
158 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
159 } while (/* CONSTCOND */ 0)
160#define BOUND_POSITIVE_INT16(val) \
161 (int16_t) ((val) <= 0 \
162 ? 0 \
163 : min ((val), (((uint16_t)-1)>>1)))
164 157
165#if ENABLE_FRILLS 158#if ENABLE_FRILLS
166typedef struct _mwmhints { 159typedef struct _mwmhints {
167 CARD32 flags; 160 CARD32 flags;
168 CARD32 functions; 161 CARD32 functions;
… …
170 INT32 input_mode; 163 INT32 input_mode;
171 CARD32 status; 164 CARD32 status;
172} MWMHints; 165} MWMHints;
173#endif 166#endif
174 167
168#if ENABLE_XEMBED
169// XEMBED messages
170# define XEMBED_EMBEDDED_NOTIFY 0
171# define XEMBED_WINDOW_ACTIVATE 1
172# define XEMBED_WINDOW_DEACTIVATE 2
173# define XEMBED_REQUEST_FOCUS 3
174# define XEMBED_FOCUS_IN 4
175# define XEMBED_FOCUS_OUT 5
176# define XEMBED_FOCUS_NEXT 6
177# define XEMBED_FOCUS_PREV 7
178
179# define XEMBED_MODALITY_ON 10
180# define XEMBED_MODALITY_OFF 11
181# define XEMBED_REGISTER_ACCELERATOR 12
182# define XEMBED_UNREGISTER_ACCELERATOR 13
183# define XEMBED_ACTIVATE_ACCELERATOR 14
184
185// XEMBED detail code
186# define XEMBED_FOCUS_CURRENT 0
187# define XEMBED_FOCUS_FIRST 1
188# define XEMBED_FOCUS_LAST 2
189
190# define XEMBED_MAPPED (1 << 0)
191#endif
192
175/* 193/*
176 ***************************************************************************** 194 *****************************************************************************
177 * NORMAL DEFINES 195 * NORMAL DEFINES
178 ***************************************************************************** 196 *****************************************************************************
179 */ 197 */
… …
229 247
230#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
231#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
232#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
233 251
234#define R_SB_RXVT 0
235#define R_SB_NEXT 1 252#define R_SB_NEXT 1
236#define R_SB_XTERM 2 253#define R_SB_XTERM 2
237#define R_SB_PLAIN 4 254#define R_SB_PLAIN 4
255#define R_SB_RXVT 8
238 256
239#define SB_WIDTH_NEXT 19 257#define SB_WIDTH_NEXT 19
240#define SB_WIDTH_XTERM 15 258#define SB_WIDTH_XTERM 15
241#define SB_WIDTH_PLAIN 7 259#define SB_WIDTH_PLAIN 7
242#ifndef SB_WIDTH_RXVT 260#ifndef SB_WIDTH_RXVT
… …
324#define FONT_DN "#-" 342#define FONT_DN "#-"
325#define FONT_UP "#+" 343#define FONT_UP "#+"
326 344
327/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
328enum { 346enum {
329 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
330 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
331 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
332}; 350};
333 351
334/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
335enum { 353enum {
336 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
… …
349enum { 367enum {
350 PRIMARY = 0, 368 PRIMARY = 0,
351 SECONDARY, 369 SECONDARY,
352}; 370};
353 371
354#define RS_None 0 /* Normal */ 372#define RS_None 0
355 373
356#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
357#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
358 376
359// font styles 377// font styles
360#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
361#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
362 380
363// fake styles 381// fake styles
364#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
365#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
366#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
367 385
368// 5 bits still to go 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
389#define RS_customShift 19
369 390
370// other flags 391// other flags
371#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
372 393
373#define RS_styleCount 4 394#define RS_styleCount 4
… …
435 XTerm_Color_UL = 19, // change actual 'Underline' color 456 XTerm_Color_UL = 19, // change actual 'Underline' color
436 XTerm_Pixmap = 20, // new bg pixmap 457 XTerm_Pixmap = 20, // new bg pixmap
437 XTerm_restoreFG = 39, // change default fg color 458 XTerm_restoreFG = 39, // change default fg color
438 XTerm_restoreBG = 49, // change default bg color 459 XTerm_restoreBG = 49, // change default bg color
439 XTerm_dumpscreen = 55, // dump scrollback and all of screen 460 XTerm_dumpscreen = 55, // dump scrollback and all of screen
461
440 XTerm_locale = 701, // change locale 462 URxvt_locale = 701, // change locale
441 XTerm_Menu = 703, // set menu item 463 URxvt_Menu = 703, // set menu item
442 XTerm_Color_IT = 704, // change actual 'Italic' colour 464 URxvt_Color_IT = 704, // change actual 'Italic' colour
443 XTerm_Color_tint = 705, // change actual tint colour 465 URxvt_Color_tint = 705, // change actual tint colour
444 466
445 URxvt_font = 710, 467 URxvt_font = 710,
446 URxvt_boldFont = 711, 468 URxvt_boldFont = 711,
447 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
448 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
471
472 URxvt_view_up = 720,
473 URxvt_view_down = 721,
449}; 474};
450 475
451/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
452/* 477/*
453 * The following comment is mostly obsolete since pixcolor_set was expanded:
454 * We're currently upto 29 colours. Only 3 more available. The
455 * PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
456 * on the unnecessary items, e.g. Color_pointer, but won't bother 479 * on the unnecessary items, e.g. Color_pointer, but won't bother
457 * until we need to. Also, be aware of usage in pixcolor_set 480 * until we need to. Also, be aware of usage in pixcolor_set
458 */ 481 */
459 482
460enum colour_list { 483enum colour_list {
… …
497 Color_BD, 520 Color_BD,
498 Color_IT, 521 Color_IT,
499 Color_UL, 522 Color_UL,
500 Color_RV, 523 Color_RV,
501#endif 524#endif
525#if ENABLE_FRILLS
526 Color_underline,
527#endif
502#ifdef OPTION_HC 528#ifdef OPTION_HC
503 Color_HC, 529 Color_HC,
504#endif 530#endif
505#ifdef KEEP_SCROLLCOLOR 531#ifdef KEEP_SCROLLCOLOR
506 Color_scroll, 532 Color_scroll,
507 Color_trough, 533 Color_trough,
508#endif 534#endif
509#if TINTING 535#if TINTING
510 Color_tint, 536 Color_tint,
537#endif
538#if OFF_FOCUS_FADING
539 Color_fade,
511#endif 540#endif
512 NRS_COLORS, /* */ 541 NRS_COLORS, /* */
513#ifdef KEEP_SCROLLCOLOR 542#ifdef KEEP_SCROLLCOLOR
514 Color_topShadow = NRS_COLORS, 543 Color_topShadow = NRS_COLORS,
515 Color_bottomShadow, 544 Color_bottomShadow,
… …
538 Rs_font, 567 Rs_font,
539#if ENABLE_STYLES 568#if ENABLE_STYLES
540 Rs_boldFont, 569 Rs_boldFont,
541 Rs_italicFont, 570 Rs_italicFont,
542 Rs_boldItalicFont, 571 Rs_boldItalicFont,
572 Rs_intensityStyles,
543#endif 573#endif
544 Rs_name, 574 Rs_name,
545 Rs_title, 575 Rs_title,
546#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 576#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
547 Rs_path, 577 Rs_path,
… …
557#ifdef HAVE_SCROLLBARS 587#ifdef HAVE_SCROLLBARS
558 Rs_scrollBar, 588 Rs_scrollBar,
559 Rs_scrollBar_right, 589 Rs_scrollBar_right,
560 Rs_scrollBar_floating, 590 Rs_scrollBar_floating,
561 Rs_scrollBar_align, 591 Rs_scrollBar_align,
562#endif
563 Rs_scrollstyle, /* Rs_scrollBar_style */ 592 Rs_scrollstyle, /* Rs_scrollBar_style */
593 Rs_scrollBar_thickness,
594#endif
564 Rs_scrollTtyOutput, 595 Rs_scrollTtyOutput,
565 Rs_scrollTtyKeypress, 596 Rs_scrollTtyKeypress,
566 Rs_scrollWithBuffer, 597 Rs_scrollWithBuffer,
567 Rs_saveLines, 598 Rs_saveLines,
568 Rs_utmpInhibit, 599 Rs_utmpInhibit,
… …
593#ifdef TRANSPARENT 624#ifdef TRANSPARENT
594 Rs_transparent, 625 Rs_transparent,
595 Rs_transparent_all, 626 Rs_transparent_all,
596#endif 627#endif
597#if ENABLE_FRILLS 628#if ENABLE_FRILLS
629 Rs_pty_fd,
630 Rs_hold,
598 Rs_ext_bwidth, 631 Rs_ext_bwidth,
599 Rs_int_bwidth, 632 Rs_int_bwidth,
600 Rs_borderLess, 633 Rs_borderLess,
601#endif
602 Rs_scrollBar_thickness,
603#ifndef NO_LINESPACE
604 Rs_lineSpace, 634 Rs_lineSpace,
635 Rs_cursorUnderline,
636#endif
637#if CURSOR_BLINK
638 Rs_cursorBlink,
639#endif
640#if ENABLE_XEMBED
641 Rs_embed,
605#endif 642#endif
606 Rs_cutchars, 643 Rs_cutchars,
607 Rs_modifier, 644 Rs_modifier,
608 Rs_answerbackstring, 645 Rs_answerbackstring,
609 Rs_tripleclickwords, 646 Rs_tripleclickwords,
610 Rs_insecure, 647 Rs_insecure,
611 Rs_cursorBlink,
612 Rs_pointerBlank, 648 Rs_pointerBlank,
613 Rs_pointerBlankDelay, 649 Rs_pointerBlankDelay,
614 Rs_imLocale, 650 Rs_imLocale,
651 Rs_imFont,
652 Rs_pastableTabs,
615#ifndef NO_SECONDARY_SCREEN 653#ifndef NO_SECONDARY_SCREEN
616 Rs_secondaryScreen, 654 Rs_secondaryScreen,
617 Rs_secondaryScroll, 655 Rs_secondaryScroll,
618#endif 656#endif
619#ifdef OFF_FOCUS_FADING 657#ifdef OFF_FOCUS_FADING
… …
633 XA_MULTIPLE, 671 XA_MULTIPLE,
634 XA_TARGETS, 672 XA_TARGETS,
635 XA_TIMESTAMP, 673 XA_TIMESTAMP,
636 XA_VT_SELECTION, 674 XA_VT_SELECTION,
637 XA_INCR, 675 XA_INCR,
676 XA_WM_PROTOCOLS,
638 XA_WMDELETEWINDOW, 677 XA_WM_DELETE_WINDOW,
678 XA_CLIPBOARD,
679#if ENABLE_FRILLS
680 XA_MOTIF_WM_HINTS,
681#endif
682#if ENABLE_EWMH
683 XA_NET_WM_PID,
684 XA_NET_WM_NAME,
685 XA_NET_WM_ICON_NAME,
686 XA_NET_WM_PING,
687#endif
688#if USE_XIM
689 XA_WM_LOCALE_NAME,
690#endif
639#ifdef TRANSPARENT 691#if TRANSPARENT
640 XA_XROOTPMAPID, 692 XA_XROOTPMAP_ID,
641 XA_XSETROOTID, 693 XA_ESETROOT_PMAP_ID,
642#endif 694#endif
643#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 695#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
644 XA_DNDPROTOCOL, 696 XA_DNDPROTOCOL,
645 XA_DNDSELECTION, 697 XA_DNDSELECTION,
646#endif /* OFFIX_DND */ 698#endif
647 XA_CLIPBOARD, 699#if ENABLE_XEMBED
700 XA_XEMBED,
701 XA_XEMBED_INFO,
702#endif
648 NUM_XA 703 NUM_XA
649}; 704};
650 705
651/* DEC private modes */ 706/* DEC private modes */
652#define PrivMode_132 (1UL<<0) 707#define PrivMode_132 (1UL<<0)
… …
679 priv_modes |= (bit); \ 734 priv_modes |= (bit); \
680 else \ 735 else \
681 priv_modes &= ~(bit) 736 priv_modes &= ~(bit)
682 737
683#ifdef ALLOW_132_MODE 738#ifdef ALLOW_132_MODE
684# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 739# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
685#else 740#else
686# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 741# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
687#endif 742#endif
688 743
689// do not change these constants lightly, there are many interdependencies 744// do not change these constants lightly, there are many interdependencies
690#define IMBUFSIZ 128 // input modifier buffer sizes 745#define IMBUFSIZ 128 // input modifier buffer sizes
691#define KBUFSZ 512 // size of keyboard mapping buffer 746#define KBUFSZ 512 // size of keyboard mapping buffer
692#define CBUFSIZ 4096 // size of command buffer 747#define CBUFSIZ 2048 // size of command buffer
693#define UBUFSIZ 4096 // character buffer 748#define UBUFSIZ 2048 // character buffer
694 749
695#ifndef PATH_MAX 750#ifndef PATH_MAX
696# define PATH_MAX 16384 751# define PATH_MAX 16384
697#endif 752#endif
698 753
… …
742#define strdup(x) strdup((const char *)(x)) 797#define strdup(x) strdup((const char *)(x))
743#define strlen(x) strlen((const char *)(x)) 798#define strlen(x) strlen((const char *)(x))
744#define strchr(x, y) strchr((const char *)(x), (int)(y)) 799#define strchr(x, y) strchr((const char *)(x), (int)(y))
745#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 800#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
746 801
802#define dDisp Display *disp = display->display
803
747/* convert pixel dimensions to row/column values. Everything as int32_t */ 804/* convert pixel dimensions to row/column values. Everything as int32_t */
748#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 805#define Pixel2Col(x) Pixel2Width((int32_t)(x))
749#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 806#define Pixel2Row(y) Pixel2Height((int32_t)(y))
750#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 807#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
751#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 808#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
752#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 809#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
753#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 810#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
754#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 811#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
755#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 812#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
756 813
757#define TermWin_TotalWidth() ((int32_t)TermWin.width) 814#define TermWin_TotalWidth() ((int32_t)this->width)
758#define TermWin_TotalHeight() ((int32_t)TermWin.height) 815#define TermWin_TotalHeight() ((int32_t)this->height)
816
817// for m >= -n, ensure remainder lies between 0..n-1
818#define MOD(m,n) (((m) + (n)) % (n))
819
820#define LINENO(n) MOD (term_start + int(n), total_rows)
821#define ROW(n) row_buf [LINENO (n)]
759 822
760/* how to build & extract colors and attributes */ 823/* how to build & extract colors and attributes */
761#define GET_BASEFG(x) (((x) & RS_fgMask)) 824#define GET_BASEFG(x) (((x) & RS_fgMask))
762#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 825#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
763#ifndef NO_BRIGHTCOLOR
764# define GET_FGCOLOR(x) \
765 ((((x) & RS_Bold) == 0 \
766 || GET_BASEFG (x) < minCOLOR \
767 || GET_BASEFG (x) >= minBrightCOLOR) \
768 ? GET_BASEFG (x) \
769 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
770# define GET_BGCOLOR(x) \
771 ((((x) & RS_Blink) == 0 \
772 || GET_BASEBG (x) < minCOLOR \
773 || GET_BASEBG (x) >= minBrightCOLOR) \
774 ? GET_BASEBG (x) \
775 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
776#else
777# define GET_FGCOLOR(x) GET_BASEFG(x)
778# define GET_BGCOLOR(x) GET_BASEBG(x)
779#endif
780 826
781#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 827#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
782#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 828#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
783 829
784#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 830#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
797 843
798#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 844#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
799#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 845#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
800 846
801#if ENABLE_STYLES 847#if ENABLE_STYLES
802# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 848# define FONTSET(style) fontset[GET_STYLE (style)]
803#else 849#else
804# define FONTSET(style) TermWin.fontset[0] 850# define FONTSET(style) fontset[0]
805#endif 851#endif
806 852
807#ifdef HAVE_SCROLLBARS 853#ifdef HAVE_SCROLLBARS
808# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 854# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
809#else 855#else
… …
834#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 880#define scrollbar_size() (scrollBar.end - scrollBar.beg \
835 - scrollbar_minheight ()) 881 - scrollbar_minheight ())
836 882
837#if (MENUBAR_MAX > 1) 883#if (MENUBAR_MAX > 1)
838/* rendition style flags */ 884/* rendition style flags */
839# define menuBar_height() (TermWin.fheight + SHADOW) 885# define menuBar_height() (fheight + SHADOW)
840# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 886# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
841# define isMenuBarWindow(w) ((w) == menuBar.win) 887# define isMenuBarWindow(w) ((w) == menuBar.win)
842#else 888#else
843# define menuBar_height() (0) 889# define menuBar_height() (0)
844# define menuBar_TotalHeight() (0) 890# define menuBar_TotalHeight() (0)
… …
848#ifdef XPM_BACKGROUND 894#ifdef XPM_BACKGROUND
849# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 895# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
850#else 896#else
851# define XPMClearArea(a, b, c, d, e, f, g) 897# define XPMClearArea(a, b, c, d, e, f, g)
852#endif 898#endif
853
854#ifndef STRICT_FONT_CHECKING
855# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
856#endif
857
858#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
859#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
860 899
861#ifdef UTMP_SUPPORT 900#ifdef UTMP_SUPPORT
862# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 901# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
863# undef HAVE_UTMPX_H 902# undef HAVE_UTMPX_H
864# undef HAVE_STRUCT_UTMPX 903# undef HAVE_STRUCT_UTMPX
… …
898#endif 937#endif
899 938
900extern class rxvt_failure_exception { } rxvt_failure_exception; 939extern class rxvt_failure_exception { } rxvt_failure_exception;
901 940
902typedef callback1<void, const char *> log_callback; 941typedef callback1<void, const char *> log_callback;
942typedef callback1<int, int> getfd_callback;
903 943
904extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 944extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
905extern void rxvt_log (const char *fmt, ...); 945extern void rxvt_log (const char *fmt, ...);
906extern void rxvt_warn (const char *fmt, ...); 946extern void rxvt_warn (const char *fmt, ...);
907extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 947extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
937 977
938 operator mbstate_t *() { return &mbs; } 978 operator mbstate_t *() { return &mbs; }
939 void reset () { memset (&mbs, 0, sizeof (mbs)); } 979 void reset () { memset (&mbs, 0, sizeof (mbs)); }
940 mbstate () { reset (); } 980 mbstate () { reset (); }
941}; 981};
982
983#define UNICODE_MASK 0x1fffffUL
942 984
943#if UNICODE3 985#if UNICODE3
944# define COMPOSE_LO 0x40000000UL 986# define COMPOSE_LO 0x40000000UL
945# define COMPOSE_HI 0x400fffffUL 987# define COMPOSE_HI 0x400fffffUL
946# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 988# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
976 1018
977extern class rxvt_composite_vec rxvt_composite; 1019extern class rxvt_composite_vec rxvt_composite;
978#endif 1020#endif
979 1021
980 1022
1023#ifdef KEYSYM_RESOURCE
1024 class keyboard_manager;
1025#endif
1026
981struct rxvt_term : zero_initialized, rxvt_vars { 1027struct rxvt_term : zero_initialized, rxvt_vars {
982 log_callback *log_hook; // log error messages through this hook, if != 0 1028 log_callback *log_hook; // log error messages through this hook, if != 0
1029 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
983 1030
984 struct mbstate mbstate; // current input multibyte state 1031 struct mbstate mbstate; // current input multibyte state
985 1032
986 unsigned char want_refresh:1, 1033 unsigned char want_refresh:1,
987#ifdef TRANSPARENT 1034#ifdef TRANSPARENT
… …
1002 hidden_text:1, 1049 hidden_text:1,
1003#endif 1050#endif
1004#ifdef POINTER_BLANK 1051#ifdef POINTER_BLANK
1005 hidden_pointer:1, 1052 hidden_pointer:1,
1006#endif 1053#endif
1007// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1054 enc_utf8:1, /* wether locale uses utf-8 */
1008 seen_input:1, /* wether we have seen some program output yet */ 1055 seen_input:1, /* wether we have seen some program output yet */
1009 seen_resize:1, /* wether we had a resize event */ 1056 seen_resize:1, /* wether we had a resize event */
1010 parsed_geometry:1; 1057 parsed_geometry:1;
1011 1058
1012 unsigned char refresh_type, 1059 unsigned char refresh_type,
… …
1058# ifdef POINTER_BLANK 1105# ifdef POINTER_BLANK
1059 pointerBlankDelay, 1106 pointerBlankDelay,
1060# endif 1107# endif
1061 allowedxerror; 1108 allowedxerror;
1062/* ---------- */ 1109/* ---------- */
1063 unsigned int ModMetaMask, 1110 unsigned int ModLevel3Mask,
1111 ModMetaMask,
1064 ModNumLockMask; 1112 ModNumLockMask;
1065 int old_width, /* last used width in screen resize */ 1113 int old_width, /* last used width in screen resize */
1066 old_height; /* last used height in screen resize */ 1114 old_height; /* last used height in screen resize */
1067 unsigned long priv_modes, 1115 unsigned long priv_modes,
1068 SavedModes; 1116 SavedModes;
… …
1098#endif 1146#endif
1099/* ---------- */ 1147/* ---------- */
1100 Time selection_time, 1148 Time selection_time,
1101 selection_request_time; 1149 selection_request_time;
1102 pid_t cmd_pid; /* process id of child */ 1150 pid_t cmd_pid; /* process id of child */
1151 char * incr_buf;
1152 size_t incr_buf_size, incr_buf_fill;
1103/* ---------- */ 1153/* ---------- */
1104 Cursor leftptr_cursor; 1154 Cursor leftptr_cursor;
1105#ifdef POINTER_BLANK
1106 Cursor blank_cursor;
1107#endif
1108/* ---------- */ 1155/* ---------- */
1109#ifndef NO_BACKSPACE_KEY 1156#ifndef NO_BACKSPACE_KEY
1110 const char *key_backspace; 1157 const char *key_backspace;
1111#endif 1158#endif
1112#ifndef NO_DELETE_KEY 1159#ifndef NO_DELETE_KEY
… …
1157 void scr_overlay_off (); 1204 void scr_overlay_off ();
1158 void scr_overlay_set (int x, int y, 1205 void scr_overlay_set (int x, int y,
1159 text_t text, 1206 text_t text,
1160 rend_t rend = OVERLAY_RSTYLE); 1207 rend_t rend = OVERLAY_RSTYLE);
1161 void scr_overlay_set (int x, int y, const char *s); 1208 void scr_overlay_set (int x, int y, const char *s);
1209 void scr_overlay_set (int x, int y, const wchar_t *s);
1162#endif 1210#endif
1163 1211
1164 vector<void *> allocated; // free these memory blocks with free() 1212 vector<void *> allocated; // free these memory blocks with free()
1165 1213
1166 char *env_windowid; /* environmental variable WINDOWID */ 1214 char *env_windowid; /* environmental variable WINDOWID */
1167 char *env_display; /* environmental variable DISPLAY */ 1215 char *env_display; /* environmental variable DISPLAY */
1168 char *env_term; /* environmental variable TERM */ 1216 char *env_term; /* environmental variable TERM */
1169 char *env_colorfgbg; 1217 char *env_colorfgbg;
1170 char *locale; 1218 char *locale;
1171#if 0
1172 char *codeset;
1173#endif
1174 char charsets[4]; 1219 char charsets[4];
1175 unsigned char *v_buffer; /* pointer to physical buffer */ 1220 unsigned char *v_buffer; /* pointer to physical buffer */
1176 unsigned int v_buflen; /* size of area to write */ 1221 unsigned int v_buflen; /* size of area to write */
1177 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1222 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1223
1178#ifdef KEYSYM_RESOURCE 1224#ifdef KEYSYM_RESOURCE
1179 const unsigned char *Keysym_map[256]; 1225 keyboard_manager *keyboard;
1180#endif 1226#endif
1227
1181 const char *rs[NUM_RESOURCES]; 1228 const char *rs[NUM_RESOURCES];
1182 /* command input buffering */ 1229 /* command input buffering */
1183 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1230 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1184 unsigned char cmdbuf_base[CBUFSIZ]; 1231 unsigned char cmdbuf_base[CBUFSIZ];
1185 1232
… …
1192 // ISO 14755 entry support 1239 // ISO 14755 entry support
1193 unicode_t iso14755buf; 1240 unicode_t iso14755buf;
1194 void commit_iso14755 (); 1241 void commit_iso14755 ();
1195 int hex_keyval (XKeyEvent &ev); 1242 int hex_keyval (XKeyEvent &ev);
1196# if ISO_14755 1243# if ISO_14755
1197 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1244 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1198 void iso14755_54 (int x, int y); 1245 void iso14755_54 (int x, int y);
1199# endif 1246# endif
1200#endif 1247#endif
1201 1248
1249 // modifies first argument(!)
1202 void paste (const unsigned char *data, unsigned int len); 1250 void paste (unsigned char *data, unsigned int len);
1203 1251
1204 void flush (); 1252 void flush ();
1205 1253
1206#if TRANSPARENT 1254#if TRANSPARENT
1207 void rootwin_cb (XEvent &xev); 1255 void rootwin_cb (XEvent &xev);
1208 xevent_watcher rootwin_ev; 1256 xevent_watcher rootwin_ev;
1209#endif 1257#endif
1210
1211
1212 void sig_term (sig_watcher &w); sig_watcher sw_term;
1213 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1214 1258
1215 void x_cb (XEvent &xev); 1259 void x_cb (XEvent &xev);
1216 xevent_watcher termwin_ev; 1260 xevent_watcher termwin_ev;
1217 xevent_watcher vt_ev; 1261 xevent_watcher vt_ev;
1218#ifdef HAVE_SCROLLBARS 1262#ifdef HAVE_SCROLLBARS
… …
1253#endif 1297#endif
1254 void pointer_unblank (); 1298 void pointer_unblank ();
1255 1299
1256 void tt_printf (const char *fmt,...); 1300 void tt_printf (const char *fmt,...);
1257 void tt_write (const unsigned char *data, unsigned int len); 1301 void tt_write (const unsigned char *data, unsigned int len);
1302 void pty_write ();
1258 1303
1259 void tt_winch (); 1304 void tt_winch ();
1260 1305
1261 rxvt_term (); 1306 rxvt_term ();
1262 ~rxvt_term (); 1307 ~rxvt_term ();
1308 void child_exit (); // child has exited, usually destroys
1263 void destroy (); 1309 void destroy ();
1310 void emergency_cleanup ();
1264 1311
1265 bool init (int argc, const char *const *argv); 1312 bool init (int argc, const char *const *argv);
1266 bool init_vars (); 1313 bool init_vars ();
1267 1314
1268 bool pty_fill (); 1315 bool pty_fill ();
… …
1277 int run_child (const char *const *argv); 1324 int run_child (const char *const *argv);
1278 1325
1279 void color_aliases (int idx); 1326 void color_aliases (int idx);
1280 void recolour_cursor (); 1327 void recolour_cursor ();
1281 void create_windows (int argc, const char *const *argv); 1328 void create_windows (int argc, const char *const *argv);
1282 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1329 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1283 void window_calc (unsigned int width, unsigned int height); 1330 void window_calc (unsigned int newwidth, unsigned int newheight);
1284 1331
1285#if USE_XIM 1332#if USE_XIM
1286 rxvt_xim *input_method; 1333 rxvt_xim *input_method;
1287 XIC Input_Context; 1334 XIC Input_Context;
1288 XIMStyle input_style; 1335 XIMStyle input_style;
… …
1322 1369
1323 bool cmd_parse (); 1370 bool cmd_parse ();
1324 void mouse_report (XButtonEvent &ev); 1371 void mouse_report (XButtonEvent &ev);
1325 void button_press (XButtonEvent &ev); 1372 void button_press (XButtonEvent &ev);
1326 void button_release (XButtonEvent &ev); 1373 void button_release (XButtonEvent &ev);
1374 void focus_in ();
1375 void focus_out ();
1327 int check_our_parents (); 1376 int check_our_parents ();
1328#ifdef PRINTPIPE 1377#ifdef PRINTPIPE
1329 FILE *popen_printer (); 1378 FILE *popen_printer ();
1330 int pclose_printer (FILE *stream); 1379 int pclose_printer (FILE *stream);
1331#endif 1380#endif
… …
1351 void makeutent (const char *pty, const char *hostname); 1400 void makeutent (const char *pty, const char *hostname);
1352 void cleanutent (); 1401 void cleanutent ();
1353 // main.C 1402 // main.C
1354 void privileged_utmp (rxvt_privaction action); 1403 void privileged_utmp (rxvt_privaction action);
1355 bool set_fonts (); 1404 bool set_fonts ();
1405 void set_string_property (Atom prop, const char *str, int len = -1);
1406 void set_utf8_property (Atom prop, const char *str, int len = -1);
1356 void set_title (const char *str); 1407 void set_title (const char *str);
1357 void set_icon_name (const char *str); 1408 void set_icon_name (const char *str);
1358 void set_window_color (int idx, const char *color); 1409 void set_window_color (int idx, const char *color);
1359 void set_colorfgbg (); 1410 void set_colorfgbg ();
1360 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1411 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1361 void set_widthheight (unsigned int width, unsigned int height); 1412 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1362 1413
1363#ifdef MENUBAR 1414#ifdef MENUBAR
1364 // menubar.C 1415 // menubar.C
1365 void menuitem_free (menu_t *menu, menuitem_t *item); 1416 void menuitem_free (menu_t *menu, menuitem_t *item);
1366 int action_dispatch (action_t *action); 1417 int action_dispatch (action_t *action);
… …
1392 void menubar_control (XButtonEvent &ev); 1443 void menubar_control (XButtonEvent &ev);
1393 void map_menuBar (int map); 1444 void map_menuBar (int map);
1394#endif 1445#endif
1395 1446
1396 // screen.C 1447 // screen.C
1397 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1448
1398 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1449 void lalloc (line_t &l)
1450 {
1451 l.t = (text_t *)talloc->alloc ();
1452 l.r = (rend_t *)ralloc->alloc ();
1453 }
1454
1455#if 0
1456 void lfree (line_t &l)
1457 {
1458 talloc->free (l.t);
1459 ralloc->free (l.r);
1460 }
1461#endif
1462
1463 void lresize (line_t &l)
1464 {
1465 if (!l.t)
1466 return;
1467
1468 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1469 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1470
1471 l.l = min (l.l, ncol);
1472
1473 if (ncol > prev_ncol)
1474 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1475 }
1476
1477 int fgcolor_of (rend_t r)
1478 {
1479 int base = GET_BASEFG (r);
1480#ifndef NO_BRIGHTCOLOR
1481 if (r & RS_Bold
1482# if ENABLE_STYLES
1483 && OPTION (Opt_intensityStyles)
1484# endif
1485 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1486 base += minBrightCOLOR - minCOLOR;
1487#endif
1488 return base;
1489 }
1490
1491 int bgcolor_of (rend_t r)
1492 {
1493 int base = GET_BASEBG (r);
1494#ifndef NO_BRIGHTCOLOR
1495 if (r & RS_Blink
1496# if ENABLE_STYLES
1497 && OPTION (Opt_intensityStyles)
1498# endif
1499 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1500 base += minBrightCOLOR - minCOLOR;
1501#endif
1502 return base;
1503 }
1504
1505 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1506 void scr_blank_screen_mem (line_t &l, rend_t efs);
1399 int scr_scroll_text (int row1, int row2, int count, int spec); 1507 int scr_scroll_text (int row1, int row2, int count);
1400 void scr_reset (); 1508 void scr_reset ();
1401 void scr_reset_realloc ();
1402 void scr_release (); 1509 void scr_release ();
1403 void scr_clear (bool really = false); 1510 void scr_clear (bool really = false);
1404 void scr_refresh (unsigned char refresh_type); 1511 void scr_refresh (unsigned char refresh_type);
1405 bool scr_refresh_rend (rend_t mask, rend_t value); 1512 bool scr_refresh_rend (rend_t mask, rend_t value);
1406 void scr_erase_screen (int mode); 1513 void scr_erase_screen (int mode);
1514#if ENABLE_FRILLS
1515 void scr_erase_savelines ();
1516 void scr_backindex ();
1517 void scr_forwardindex ();
1518#endif
1407 void scr_touch (bool refresh); 1519 void scr_touch (bool refresh);
1408 void scr_expose (int x, int y, int width, int height, bool refresh); 1520 void scr_expose (int x, int y, int width, int height, bool refresh);
1409 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1521 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1410 void scr_recolour (); 1522 void scr_recolour ();
1411 void scr_remap_chars (); 1523 void scr_remap_chars ();
1412 void scr_remap_chars (text_t *tp, rend_t *rp); 1524 void scr_remap_chars (const line_t &l);
1413 1525
1414 void scr_poweron (); 1526 void scr_poweron ();
1415 void scr_cursor (int mode); 1527 void scr_cursor (int mode);
1416 void scr_do_wrap (); 1528 void scr_do_wrap ();
1417 int scr_change_screen (int scrn); 1529 int scr_change_screen (int scrn);
1418 void scr_color (unsigned int color, int fgbg); 1530 void scr_color (unsigned int color, int fgbg);
1419 void scr_rendition (int set, int style); 1531 void scr_rendition (int set, int style);
1420 void scr_add_lines (const unicode_t *str, int nlines, int len); 1532 void scr_add_lines (const unicode_t *str, int nlines, int len);
1421 void scr_backspace (); 1533 void scr_backspace ();
1422 void scr_tab (int count, bool ht = false); 1534 void scr_tab (int count, bool ht = false);
1423 void scr_backindex ();
1424 void scr_forwardindex ();
1425 void scr_gotorc (int row, int col, int relative); 1535 void scr_gotorc (int row, int col, int relative);
1426 void scr_index (enum page_dirn direction); 1536 void scr_index (enum page_dirn direction);
1427 void scr_erase_line (int mode); 1537 void scr_erase_line (int mode);
1428 void scr_E (); 1538 void scr_E ();
1429 void scr_insdel_lines (int count, int insdel); 1539 void scr_insdel_lines (int count, int insdel);
… …
1445 void scr_bell (); 1555 void scr_bell ();
1446 void scr_printscreen (int fullhist); 1556 void scr_printscreen (int fullhist);
1447 void scr_reverse_selection (); 1557 void scr_reverse_selection ();
1448 void scr_dump (int fd); 1558 void scr_dump (int fd);
1449 void selection_check (int check_more); 1559 void selection_check (int check_more);
1450 int selection_paste (Window win, Atom prop, bool delete_prop); 1560 void selection_paste (Window win, Atom prop, bool delete_prop);
1451 void selection_property (Window win, Atom prop); 1561 void selection_property (Window win, Atom prop);
1452 void selection_request (Time tm, int x, int y); 1562 void selection_request (Time tm, int x, int y);
1453 int selection_request_other (Atom target, int selnum); 1563 int selection_request_other (Atom target, int selnum);
1454 void selection_clear (); 1564 void selection_clear ();
1455 void selection_make (Time tm); 1565 void selection_make (Time tm);
… …
1490 1600
1491 // xdefaults.C 1601 // xdefaults.C
1492 void get_options (int argc, const char *const *argv); 1602 void get_options (int argc, const char *const *argv);
1493 int parse_keysym (const char *str, const char *arg); 1603 int parse_keysym (const char *str, const char *arg);
1494 void get_xdefaults (FILE *stream, const char *name); 1604 void get_xdefaults (FILE *stream, const char *name);
1495 void extract_resources (Display *display, const char *name); 1605 void extract_resources ();
1496 // xpm.C 1606 // xpm.C
1497 int scale_pixmap (const char *geom); 1607 int scale_pixmap (const char *geom);
1498 void resize_pixmap (); 1608 void resize_pixmap ();
1499 Pixmap set_bgPixmap (const char *file); 1609 Pixmap set_bgPixmap (const char *file);
1500}; 1610};

Diff Legend

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