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.88 by root, Sun Aug 8 14:44:21 2004 UTC vs.
Revision 1.126 by root, Wed Dec 1 02:12:18 2004 UTC

… …
9 9
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#ifndef NO_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 "defaultfont.h"
20#include "rxvtcolor.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23 23
24/* 24/*
25 ***************************************************************************** 25 *****************************************************************************
… …
28 */ 28 */
29/* Consistent defines - please report on the necessity 29/* Consistent defines - please report on the necessity
30 * @ Unixware: defines (__svr4__) 30 * @ Unixware: defines (__svr4__)
31 */ 31 */
32#if defined (SVR4) && !defined (__svr4__) 32#if defined (SVR4) && !defined (__svr4__)
33# define __svr4__ 33# define __svr4__ 1
34#endif 34#endif
35#if defined (sun) && !defined (__sun__) 35#if defined (sun) && !defined (__sun__)
36# define __sun__ 36# define __sun__ 1
37#endif 37#endif
38 38
39#ifndef HAVE_XPOINTER 39#ifndef HAVE_XPOINTER
40typedef char *XPointer; 40typedef char *XPointer;
41#endif 41#endif
… …
68# define STDERR_FILENO 2 68# define STDERR_FILENO 2
69#endif 69#endif
70 70
71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
73# define NO_SETOWNER_TTYDEV 73# define NO_SETOWNER_TTYDEV 1
74# endif 74# endif
75#endif 75#endif
76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY) 76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
77# define NO_SETOWNER_TTYDEV 77# define NO_SETOWNER_TTYDEV 1
78#endif 78#endif
79
80/*
81 *****************************************************************************
82 * PROTOTYPES
83 *****************************************************************************
84 */
85RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size);
91char * rxvt_wcstombs (const wchar_t *str, int len);
92char * rxvt_strdup (const char *str);
93char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...);
97void rxvt_fatal (const char *fmt,...);
98void rxvt_exit_failure ();
99int rxvt_Str_match (const char *s1, const char *s2);
100const char * rxvt_Str_skip_space (const char *str);
101char * rxvt_Str_trim (char *str);
102int rxvt_Str_escaped (char *str);
103char ** rxvt_splitcommastring (const char *cs);
104void rxvt_freecommastring (char **cs);
105char * 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);
107void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
108
109void rxvt_privileges (rxvt_privaction action);
79 110
80/* 111/*
81 ***************************************************************************** 112 *****************************************************************************
82 * STRUCTURES AND TYPEDEFS 113 * STRUCTURES AND TYPEDEFS
83 ***************************************************************************** 114 *****************************************************************************
… …
93#endif 124#endif
94 125
95/* If we're using either the rxvt scrollbar or menu bars, keep the 126/* If we're using either the rxvt scrollbar or menu bars, keep the
96 * scrollColor resource. 127 * scrollColor resource.
97 */ 128 */
98#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 129#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
99# define KEEP_SCROLLCOLOR 1 130# define KEEP_SCROLLCOLOR 1
100#else 131#else
101# undef KEEP_SCROLLCOLOR 132# undef KEEP_SCROLLCOLOR
102#endif 133#endif
103 134
… …
116 int clicks; 147 int clicks;
117 Time time; /* milliseconds */ 148 Time time; /* milliseconds */
118 unsigned int state; /* key or button mask */ 149 unsigned int state; /* key or button mask */
119 unsigned int button; /* detail */ 150 unsigned int button; /* detail */
120}; 151};
121
122#ifndef min
123# define min(a,b) (((a) < (b)) ? (a) : (b))
124# define max(a,b) (((a) > (b)) ? (a) : (b))
125#endif
126 152
127#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 153#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
128#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 154#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
129#define SWAP_IT(one, two, typeof) \ 155#define SWAP_IT(one, two, typeof) \
130 do { \ 156 do { \
… …
134#define BOUND_POSITIVE_INT16(val) \ 160#define BOUND_POSITIVE_INT16(val) \
135 (int16_t) ((val) <= 0 \ 161 (int16_t) ((val) <= 0 \
136 ? 0 \ 162 ? 0 \
137 : min ((val), (((uint16_t)-1)>>1))) 163 : min ((val), (((uint16_t)-1)>>1)))
138 164
139#ifndef NO_FRILLS 165#if ENABLE_FRILLS
140typedef struct _mwmhints { 166typedef struct _mwmhints {
141 CARD32 flags; 167 CARD32 flags;
142 CARD32 functions; 168 CARD32 functions;
143 CARD32 decorations; 169 CARD32 decorations;
144 INT32 input_mode; 170 INT32 input_mode;
… …
158# define COLORTERMENVFULL COLORTERMENV "-xpm" 184# define COLORTERMENVFULL COLORTERMENV "-xpm"
159#else 185#else
160# define COLORTERMENVFULL COLORTERMENV 186# define COLORTERMENVFULL COLORTERMENV
161#endif 187#endif
162#ifndef TERMENV 188#ifndef TERMENV
163# define TERMENV "rxvt" 189# define TERMENV "rxvt-unicode"
164#endif 190#endif
165 191
166#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 192#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
167# define NO_MOUSE_REPORT_SCROLLBAR 193# define NO_MOUSE_REPORT_SCROLLBAR 1
168#endif 194#endif
169 195
170#ifdef NO_RESOURCES 196#ifdef NO_RESOURCES
171# undef USE_XGETDEFAULT 197# undef USE_XGETDEFAULT
198#endif
199
200#if ISO_14755
201# define ENABLE_OVERLAY 1
172#endif 202#endif
173 203
174/* now look for other badly set stuff */ 204/* now look for other badly set stuff */
175 205
176#if !defined (EACCESS) && defined(EAGAIN) 206#if !defined (EACCESS) && defined(EAGAIN)
… …
185#define menuBar_esc 10 215#define menuBar_esc 10
186#define scrollBar_esc 30 216#define scrollBar_esc 30
187#define menuBar_margin 2 /* margin below text */ 217#define menuBar_margin 2 /* margin below text */
188 218
189#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 219#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
190# define HAVE_SCROLLBARS 220# define HAVE_SCROLLBARS 1
191#endif 221#endif
192 222
193/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 223/* width of scrollBar, menuBar shadow, must be 1 or 2 */
194#ifdef HALFSHADOW 224#ifdef HALFSHADOW
195# define SHADOW 1 225# define SHADOW 1
… …
287# define NSCREENS 0 317# define NSCREENS 0
288#else 318#else
289# define NSCREENS 1 319# define NSCREENS 1
290#endif 320#endif
291 321
292#define IGNORE 0
293#define SAVE 's'
294#define RESTORE 'r'
295
296/* special (internal) prefix for font commands */ 322/* special (internal) prefix for font commands */
297#define FONT_CMD '#' 323#define FONT_CMD '#'
298#define FONT_DN "#-" 324#define FONT_DN "#-"
299#define FONT_UP "#+" 325#define FONT_UP "#+"
300 326
… …
325 SECONDARY, 351 SECONDARY,
326}; 352};
327 353
328#define RS_None 0 /* Normal */ 354#define RS_None 0 /* Normal */
329 355
330#define RS_fgMask 0x000001FFu /* 512 colors */ 356#define RS_fgMask 0x0000007fUL /* 128 colors */
331#define RS_bgMask 0x0003FE00u /* 512 colors */ 357#define RS_bgMask 0x00003f80UL /* 128 colors */
332#define RS_Bold 0x00040000u /* bold */ 358
359// font styles
360#define RS_Bold 0x00004000UL // value 1
361#define RS_Italic 0x00008000UL // value 2
362
363// fake styles
333#define RS_Blink 0x00080000u /* blink */ 364#define RS_Blink 0x00010000UL /* blink */
334#define RS_RVid 0x00100000u /* reverse video */ 365#define RS_RVid 0x00020000UL /* reverse video */
335#define RS_Uline 0x00200000u /* underline */ 366#define RS_Uline 0x00040000UL /* underline */
336 367
337#define RS_fontMask 0xffc00000u /* plenty(?) of fonts */ 368// 5 bits still to go
338#define RS_fontShift 22
339 369
370// other flags
371#define RS_Careful 0x80000000UL /* be careful when drawing these */
372
373#define RS_styleCount 4
374#define RS_styleMask (RS_Bold | RS_Italic)
375#define RS_styleShift 14
376
340#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 377#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
341#define RS_attrMask (RS_baseattrMask|RS_fontMask) 378#define RS_attrMask (RS_baseattrMask | RS_fontMask)
379
380#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
381#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
382#define RS_fontShift 24
383
384#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
385#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
342 386
343#define Sel_none 0 /* Not waiting */ 387#define Sel_none 0 /* Not waiting */
344#define Sel_normal 0x01 /* normal selection */ 388#define Sel_normal 0x01 /* normal selection */
345#define Sel_incr 0x02 /* incremental selection */ 389#define Sel_incr 0x02 /* incremental selection */
346#define Sel_direct 0x00 390#define Sel_direct 0x00
… …
392 XTerm_Pixmap = 20, // new bg pixmap 436 XTerm_Pixmap = 20, // new bg pixmap
393 XTerm_restoreFG = 39, // change default fg color 437 XTerm_restoreFG = 39, // change default fg color
394 XTerm_restoreBG = 49, // change default bg color 438 XTerm_restoreBG = 49, // change default bg color
395 XTerm_dumpscreen = 55, // dump scrollback and all of screen 439 XTerm_dumpscreen = 55, // dump scrollback and all of screen
396 XTerm_locale = 701, // change locale 440 XTerm_locale = 701, // change locale
397 XTerm_findfont = 702, // find font of given character (in decimal)
398 XTerm_Menu = 703, // set menu item 441 XTerm_Menu = 703, // set menu item
442 XTerm_Color_IT = 704, // change actual 'Italic' colour
443 XTerm_Color_tint = 705, // change actual tint colour
444
445 URxvt_font = 710,
446 URxvt_boldFont = 711,
447 URxvt_italicFont = 712,
448 URxvt_boldItalicFont = 713,
399}; 449};
400 450
401/* Words starting with `Color_' are colours. Others are counts */ 451/* Words starting with `Color_' are colours. Others are counts */
402/* 452/*
403 * The following comment is mostly obsolete since pixcolor_set was expanded: 453 * The following comment is mostly obsolete since pixcolor_set was expanded:
… …
432 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 482 maxBrightCOLOR, /* minBrightCOLOR + 7 */
433 Color_White = maxBrightCOLOR, 483 Color_White = maxBrightCOLOR,
434#else 484#else
435 Color_White = maxCOLOR, 485 Color_White = maxCOLOR,
436#endif 486#endif
437#ifdef TTY_256COLOR
438 min256COLOR = Color_White + 1, 487 minTermCOLOR = Color_White + 1,
439 max256COLOR = minCOLOR + 255, 488 maxTermCOLOR = Color_White + 72,
440#endif
441#ifndef NO_CURSORCOLOR 489#ifndef NO_CURSORCOLOR
442 Color_cursor, 490 Color_cursor,
443 Color_cursor2, 491 Color_cursor2,
444#endif 492#endif
445 Color_pointer_fg, 493 Color_pointer_fg,
446 Color_pointer_bg, 494 Color_pointer_bg,
447 Color_border, 495 Color_border,
448#ifndef NO_BOLD_UNDERLINE_REVERSE 496#ifndef NO_BOLD_UNDERLINE_REVERSE
449 Color_BD, 497 Color_BD,
498 Color_IT,
450 Color_UL, 499 Color_UL,
451 Color_RV, 500 Color_RV,
452#endif 501#endif
453#ifdef OPTION_HC 502#ifdef OPTION_HC
454 Color_HC, 503 Color_HC,
… …
462#endif 511#endif
463 NRS_COLORS, /* */ 512 NRS_COLORS, /* */
464#ifdef KEEP_SCROLLCOLOR 513#ifdef KEEP_SCROLLCOLOR
465 Color_topShadow = NRS_COLORS, 514 Color_topShadow = NRS_COLORS,
466 Color_bottomShadow, 515 Color_bottomShadow,
467 TOTAL_COLORS /* upto 30 */ 516 TOTAL_COLORS
468#else 517#else
469 TOTAL_COLORS = NRS_COLORS /* */ 518 TOTAL_COLORS = NRS_COLORS
470#endif 519#endif
471}; 520};
472 521
473#define Color_Bits 9 522#define Color_Bits 7 // 0 .. maxTermCOLOR
523
474#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 524#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
475#define NPIXCLR_BITS 32 525#define NPIXCLR_BITS 32
476
477#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
478 526
479/* 527/*
480 * Resource list 528 * Resource list
481 */ 529 */
482enum { 530enum {
… …
486 Rs_geometry, 534 Rs_geometry,
487 Rs_reverseVideo, 535 Rs_reverseVideo,
488 Rs_color, 536 Rs_color,
489 _Rs_color = Rs_color + NRS_COLORS - 1, 537 _Rs_color = Rs_color + NRS_COLORS - 1,
490 Rs_font, 538 Rs_font,
539#if ENABLE_STYLES
540 Rs_boldFont,
541 Rs_italicFont,
542 Rs_boldItalicFont,
543#endif
491 Rs_name, 544 Rs_name,
492 Rs_title, 545 Rs_title,
493#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 546#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
494 Rs_path, 547 Rs_path,
495#endif 548#endif
… …
539#endif 592#endif
540#ifdef TRANSPARENT 593#ifdef TRANSPARENT
541 Rs_transparent, 594 Rs_transparent,
542 Rs_transparent_all, 595 Rs_transparent_all,
543#endif 596#endif
544#ifndef NO_FRILLS 597#if ENABLE_FRILLS
545 Rs_ext_bwidth, 598 Rs_ext_bwidth,
546 Rs_int_bwidth, 599 Rs_int_bwidth,
547 Rs_borderLess, 600 Rs_borderLess,
548#endif 601#endif
549 Rs_scrollBar_thickness, 602 Rs_scrollBar_thickness,
… …
557 Rs_insecure, 610 Rs_insecure,
558 Rs_cursorBlink, 611 Rs_cursorBlink,
559 Rs_pointerBlank, 612 Rs_pointerBlank,
560 Rs_pointerBlankDelay, 613 Rs_pointerBlankDelay,
561 Rs_imLocale, 614 Rs_imLocale,
615 Rs_pastableTabs,
562#ifndef NO_SECONDARY_SCREEN 616#ifndef NO_SECONDARY_SCREEN
563 Rs_secondaryScreen, 617 Rs_secondaryScreen,
564 Rs_secondaryScroll, 618 Rs_secondaryScroll,
565#endif
566#ifndef NO_BOLD_UNDERLINE_REVERSE
567 Rs_realBold,
568#endif 619#endif
569#ifdef OFF_FOCUS_FADING 620#ifdef OFF_FOCUS_FADING
570 Rs_fade, 621 Rs_fade,
571#endif 622#endif
572#ifdef TINTING 623#ifdef TINTING
… …
597 XA_CLIPBOARD, 648 XA_CLIPBOARD,
598 NUM_XA 649 NUM_XA
599}; 650};
600 651
601/* DEC private modes */ 652/* DEC private modes */
602#define PrivMode_132 (1LU<<0) 653#define PrivMode_132 (1UL<<0)
603#define PrivMode_132OK (1LU<<1) 654#define PrivMode_132OK (1UL<<1)
604#define PrivMode_rVideo (1LU<<2) 655#define PrivMode_rVideo (1UL<<2)
605#define PrivMode_relOrigin (1LU<<3) 656#define PrivMode_relOrigin (1UL<<3)
606#define PrivMode_Screen (1LU<<4) 657#define PrivMode_Screen (1UL<<4)
607#define PrivMode_Autowrap (1LU<<5) 658#define PrivMode_Autowrap (1UL<<5)
608#define PrivMode_aplCUR (1LU<<6) 659#define PrivMode_aplCUR (1UL<<6)
609#define PrivMode_aplKP (1LU<<7) 660#define PrivMode_aplKP (1UL<<7)
610#define PrivMode_HaveBackSpace (1LU<<8) 661#define PrivMode_HaveBackSpace (1UL<<8)
611#define PrivMode_BackSpace (1LU<<9) 662#define PrivMode_BackSpace (1UL<<9)
612#define PrivMode_ShiftKeys (1LU<<10) 663#define PrivMode_ShiftKeys (1UL<<10)
613#define PrivMode_VisibleCursor (1LU<<11) 664#define PrivMode_VisibleCursor (1UL<<11)
614#define PrivMode_MouseX10 (1LU<<12) 665#define PrivMode_MouseX10 (1UL<<12)
615#define PrivMode_MouseX11 (1LU<<13) 666#define PrivMode_MouseX11 (1UL<<13)
616#define PrivMode_scrollBar (1LU<<14) 667#define PrivMode_scrollBar (1UL<<14)
617#define PrivMode_menuBar (1LU<<15) 668#define PrivMode_menuBar (1UL<<15)
618#define PrivMode_TtyOutputInh (1LU<<16) 669#define PrivMode_TtyOutputInh (1UL<<16)
619#define PrivMode_Keypress (1LU<<17) 670#define PrivMode_Keypress (1UL<<17)
620#define PrivMode_smoothScroll (1LU<<18) 671#define PrivMode_smoothScroll (1UL<<18)
621#define PrivMode_vt52 (1LU<<19) 672#define PrivMode_vt52 (1UL<<19)
673#define PrivMode_LFNL (1UL<<20)
622/* too annoying to implement X11 highlight tracking */ 674/* too annoying to implement X11 highlight tracking */
623/* #define PrivMode_MouseX11Track (1LU<<20) */ 675/* #define PrivMode_MouseX11Track (1LU<<21) */
624 676
625#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 677#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
626#define PrivMode(test,bit) \ 678#define PrivMode(test,bit) \
627 if (test) \ 679 if (test) \
628 PrivateModes |= (bit); \ 680 priv_modes |= (bit); \
629 else \ 681 else \
630 PrivateModes &= ~(bit) 682 priv_modes &= ~(bit)
631 683
632#ifdef ALLOW_132_MODE 684#ifdef ALLOW_132_MODE
633# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 685# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
634#else 686#else
635# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 687# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
675/* 727/*
676 ***************************************************************************** 728 *****************************************************************************
677 * MACRO DEFINES 729 * MACRO DEFINES
678 ***************************************************************************** 730 *****************************************************************************
679 */ 731 */
680#define MEMSET(x, y, z) memset((x), (y), (size_t)(z)) 732#define memset(x, y, z) memset((x), (y), (size_t)(z))
681#define MEMCPY(x, y, z) memcpy((void *)(x), (const void *)(y), (z)) 733#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
682#define MEMMOVE(x, y, z) memmove((void *)(x), (const void *)(y), (z)) 734#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
683#define STRCASECMP(x, y) strcasecmp((x), (y)) 735#define strcasecmp(x, y) strcasecmp((x), (y))
684#define STRNCASECMP(x, y, z) strncasecmp((x), (y), (z)) 736#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
685#define STRCPY(x, y) strcpy((char *)(x), (const char *)(y)) 737#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
686#define STRNCPY(x, y, z) strncpy((char *)(x), (const char *)(y), (z)) 738#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
687#define STRCMP(x, y) strcmp((const char *)(x), (const char *)(y)) 739#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
688#define STRNCMP(x, y, z) strncmp((const char *)(x), (const char *)(y), (z)) 740#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
689#define STRCAT(x, y) strcat((char *)(x), (const char *)(y)) 741#define strcat(x, y) strcat((char *)(x), (const char *)(y))
690#define STRNCAT(x, y, z) strncat((char *)(x), (const char *)(y), (z)) 742#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
691#define STRDUP(x) strdup((const char *)(x)) 743#define strdup(x) strdup((const char *)(x))
692#define STRLEN(x) strlen((const char *)(x)) 744#define strlen(x) strlen((const char *)(x))
693#define STRCHR(x, y) strchr((const char *)(x), (int)(y)) 745#define strchr(x, y) strchr((const char *)(x), (int)(y))
694#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y)) 746#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
695 747
696/* convert pixel dimensions to row/column values. Everything as int32_t */ 748/* convert pixel dimensions to row/column values. Everything as int32_t */
697#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 749#define Pixel2Col(x) Pixel2Width((int32_t)(x))
698#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 750#define Pixel2Row(y) Pixel2Height((int32_t)(y))
699#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 751#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
… …
726# define GET_FGCOLOR(x) GET_BASEFG(x) 778# define GET_FGCOLOR(x) GET_BASEFG(x)
727# define GET_BGCOLOR(x) GET_BASEBG(x) 779# define GET_BGCOLOR(x) GET_BASEBG(x)
728#endif 780#endif
729 781
730#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 782#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
731#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 783#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
784
785#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
786#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
732 787
733#define GET_ATTR(x) (((x) & RS_attrMask)) 788#define GET_ATTR(x) (((x) & RS_attrMask))
734#define GET_BGATTR(x) \ 789#define GET_BGATTR(x) \
735 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 790 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
736 | (((x) & RS_fgMask)<<Color_Bits)) \ 791 | (((x) & RS_fgMask)<<Color_Bits)) \
737 : ((x) & (RS_attrMask | RS_bgMask))) 792 : ((x) & (RS_attrMask | RS_bgMask)))
738#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 793#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
739#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 794#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
740#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 795#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
796
797#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
741 798
742#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 799#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
743#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 800#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
801
802#if ENABLE_STYLES
803# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]
804#else
805# define FONTSET(style) TermWin.fontset[0]
806#endif
744 807
745#ifdef HAVE_SCROLLBARS 808#ifdef HAVE_SCROLLBARS
746# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 809# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
747#else 810#else
748# define scrollbar_TotalWidth() (0) 811# define scrollbar_TotalWidth() (0)
… …
827#ifdef DEBUG_MAIN 890#ifdef DEBUG_MAIN
828# define D_MAIN(x) fprintf x ; fputc('\n', stderr) 891# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
829#else 892#else
830# define D_MAIN(x) 893# define D_MAIN(x)
831#endif 894#endif
832#ifdef DEBUG_SCREEN
833# define D_SCREEN(x) fprintf x ; fputc('\n', stderr)
834#else
835# define D_SCREEN(x)
836#endif
837#ifdef DEBUG_SELECT
838# define D_SELECT(x) fprintf x ; fputc('\n', stderr)
839#else
840# define D_SELECT(x)
841#endif
842#ifdef DEBUG_SIZE 895#ifdef DEBUG_SIZE
843# define D_SIZE(x) fprintf x ; fputc('\n', stderr) 896# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
844#else 897#else
845# define D_SIZE(x) 898# define D_SIZE(x)
846#endif
847#ifdef DEBUG_X
848# define D_X(x) fprintf x ; fputc('\n', stderr)
849#else
850# define D_X(x)
851#endif 899#endif
852 900
853extern class rxvt_failure_exception { } rxvt_failure_exception; 901extern class rxvt_failure_exception { } rxvt_failure_exception;
854 902
855typedef callback1<void, const char *> log_callback; 903typedef callback1<void, const char *> log_callback;
… …
887// primivite wrapper around mbstate_t to ensure initialisation 935// primivite wrapper around mbstate_t to ensure initialisation
888struct mbstate { 936struct mbstate {
889 mbstate_t mbs; 937 mbstate_t mbs;
890 938
891 operator mbstate_t *() { return &mbs; } 939 operator mbstate_t *() { return &mbs; }
892 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); } 940 void reset () { memset (&mbs, 0, sizeof (mbs)); }
893 mbstate () { reset (); } 941 mbstate () { reset (); }
894}; 942};
895 943
896#if UNICODE3 944#if UNICODE3
897# define COMPOSE_LO 0x40000000UL 945# define COMPOSE_LO 0x40000000UL
… …
929 977
930extern class rxvt_composite_vec rxvt_composite; 978extern class rxvt_composite_vec rxvt_composite;
931#endif 979#endif
932 980
933 981
934struct rxvt_term : rxvt_vars { 982struct rxvt_term : zero_initialized, rxvt_vars {
935 log_callback *log_hook; // log error messages through this hook, if != 0 983 log_callback *log_hook; // log error messages through this hook, if != 0
936 984
937 struct mbstate mbstate; // current input multibyte state 985 struct mbstate mbstate; // current input multibyte state
938 986
939 unsigned char want_refresh:1, 987 unsigned char want_refresh:1,
… …
956#endif 1004#endif
957#ifdef POINTER_BLANK 1005#ifdef POINTER_BLANK
958 hidden_pointer:1, 1006 hidden_pointer:1,
959#endif 1007#endif
960// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1008// enc_utf8:1, /* wether terminal reads/writes utf-8 */
1009 seen_input:1, /* wether we have seen some program output yet */
1010 seen_resize:1, /* wether we had a resize event */
961 parsed_geometry:1; 1011 parsed_geometry:1;
962 1012
963 unsigned char refresh_type, 1013 unsigned char refresh_type,
964#ifdef UTMP_SUPPORT
965 next_utmp_action,
966#endif
967#ifndef NO_SETOWNER_TTYDEV
968 next_tty_action,
969#endif
970#ifdef META8_OPTION 1014#ifdef META8_OPTION
971 meta_char, /* Alt-key prefix */ 1015 meta_char, /* Alt-key prefix */
972#endif 1016#endif
973 scrollbar_align, 1017 scrollbar_align,
974 selection_wait, 1018 selection_wait,
975 selection_type; 1019 selection_type;
976/* ---------- */ 1020/* ---------- */
977 short rvideo; 1021 short rvideo;
978 int16_t num_scr; /* screen: number lines scrolled */ 1022 int num_scr; /* screen: number lines scrolled */
979 unsigned int prev_ncol, /* screen: previous number of columns */ 1023 int prev_ncol, /* screen: previous number of columns */
980 prev_nrow; /* screen: previous number of rows */ 1024 prev_nrow; /* screen: previous number of rows */
981/* ---------- */ 1025/* ---------- */
982 rend_t rstyle; 1026 rend_t rstyle;
983/* ---------- */ 1027/* ---------- */
984 uint32_t pixcolor_set[NPIXCLR_SETS]; 1028 uint32_t pixcolor_set[NPIXCLR_SETS];
… …
1016 pointerBlankDelay, 1060 pointerBlankDelay,
1017# endif 1061# endif
1018 allowedxerror; 1062 allowedxerror;
1019/* ---------- */ 1063/* ---------- */
1020 unsigned int ModMetaMask, 1064 unsigned int ModMetaMask,
1021 ModNumLockMask, 1065 ModNumLockMask;
1022 old_width, /* last used width in screen resize */ 1066 int old_width, /* last used width in screen resize */
1023 old_height, /* last used height in screen resize */ 1067 old_height; /* last used height in screen resize */
1024#ifndef NO_BRIGHTCOLOR
1025 colorfgbg,
1026#endif
1027 ttymode;
1028 unsigned long PrivateModes, 1068 unsigned long priv_modes,
1029 SavedModes; 1069 SavedModes;
1030/* ---------- */ 1070/* ---------- */
1031 Atom xa[NUM_XA]; 1071 Atom xa[NUM_XA];
1032/* ---------- */ 1072/* ---------- */
1033#ifdef MENUBAR 1073#ifdef MENUBAR
… …
1059#endif 1099#endif
1060/* ---------- */ 1100/* ---------- */
1061 Time selection_time, 1101 Time selection_time,
1062 selection_request_time; 1102 selection_request_time;
1063 pid_t cmd_pid; /* process id of child */ 1103 pid_t cmd_pid; /* process id of child */
1064 gid_t ttygid;
1065#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
1066 uid_t euid;
1067 gid_t egid;
1068#endif
1069/* ---------- */ 1104/* ---------- */
1070 Cursor leftptr_cursor; 1105 Cursor leftptr_cursor;
1071#ifdef POINTER_BLANK 1106#ifdef POINTER_BLANK
1072 Cursor blank_cursor; 1107 Cursor blank_cursor;
1073#endif 1108#endif
1074/* ---------- */ 1109/* ---------- */
1075 const char *ttydev; /* pty/tty name */
1076#ifndef NO_BACKSPACE_KEY 1110#ifndef NO_BACKSPACE_KEY
1077 const char *key_backspace; 1111 const char *key_backspace;
1078#endif 1112#endif
1079#ifndef NO_DELETE_KEY 1113#ifndef NO_DELETE_KEY
1080 const char *key_delete; 1114 const char *key_delete;
1081#endif
1082#ifdef USE_XIM
1083 rxvt_xim *input_method;
1084 XIC Input_Context;
1085 XIMStyle input_style;
1086 int event_type;
1087#endif 1115#endif
1088 struct mouse_event MEvent; 1116 struct mouse_event MEvent;
1089 XComposeStatus compose; 1117 XComposeStatus compose;
1090 ttymode_t tio; 1118 ttymode_t tio;
1091#ifdef UTMP_SUPPORT 1119#ifdef UTMP_SUPPORT
… …
1103 row_col_t oldcursor; 1131 row_col_t oldcursor;
1104#ifdef XPM_BACKGROUND 1132#ifdef XPM_BACKGROUND
1105 bgPixmap_t bgPixmap; 1133 bgPixmap_t bgPixmap;
1106 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1134 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1107#endif 1135#endif
1108#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1109 struct stat ttyfd_stat; /* original status of our tty */
1110#endif
1111#ifdef MENUBAR 1136#ifdef MENUBAR
1112 menu_t *ActiveMenu, /* currently active menu */ 1137 menu_t *ActiveMenu, /* currently active menu */
1113 *BuildMenu; /* the menu currently being built */ 1138 *BuildMenu; /* the menu currently being built */
1114 bar_t *CurrentBar; 1139 bar_t *CurrentBar;
1115# if ! (MENUBAR_MAX > 1) 1140# if ! (MENUBAR_MAX > 1)
… …
1121#endif 1146#endif
1122#ifdef POINTER_BLANK 1147#ifdef POINTER_BLANK
1123 struct timeval lastmotion; 1148 struct timeval lastmotion;
1124#endif 1149#endif
1125 1150
1151#if ENABLE_OVERLAY
1152 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1153 text_t **ov_text;
1154 rend_t **ov_rend;
1155
1156 void scr_swap_overlay ();
1157 void scr_overlay_new (int x, int y, int w, int h);
1158 void scr_overlay_off ();
1159 void scr_overlay_set (int x, int y,
1160 text_t text,
1161 rend_t rend = OVERLAY_RSTYLE);
1162 void scr_overlay_set (int x, int y, const char *s);
1163#endif
1164
1126 vector<void *> allocated; // free these memory blocks with free() 1165 vector<void *> allocated; // free these memory blocks with free()
1127 1166
1128 char *env_windowid; /* environmental variable WINDOWID */ 1167 char *env_windowid; /* environmental variable WINDOWID */
1129 char *env_display; /* environmental variable DISPLAY */ 1168 char *env_display; /* environmental variable DISPLAY */
1130 char *env_term; /* environmental variable TERM */ 1169 char *env_term; /* environmental variable TERM */
… …
1148 rxvt_salloc *talloc; // text line allocator 1187 rxvt_salloc *talloc; // text line allocator
1149 rxvt_salloc *ralloc; // rend line allocator 1188 rxvt_salloc *ralloc; // rend line allocator
1150 1189
1151 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1190 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1152 1191
1192#if ENABLE_FRILLS || ISO_14755
1193 // ISO 14755 entry support
1194 unicode_t iso14755buf;
1195 void commit_iso14755 ();
1196 int hex_keyval (XKeyEvent &ev);
1197# if ISO_14755
1198 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1199 void iso14755_54 (int x, int y);
1200# endif
1201#endif
1202
1153 void paste (const unsigned char *data, unsigned int len); 1203 void paste (const unsigned char *data, unsigned int len);
1154 1204
1155 void flush (); 1205 void flush ();
1156 1206
1207#if TRANSPARENT
1157 void rootwin_cb (XEvent &xev); 1208 void rootwin_cb (XEvent &xev);
1158 xevent_watcher rootwin_ev; 1209 xevent_watcher rootwin_ev;
1210#endif
1211
1212
1213 void sig_term (sig_watcher &w); sig_watcher sw_term;
1214 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1159 1215
1160 void x_cb (XEvent &xev); 1216 void x_cb (XEvent &xev);
1161 xevent_watcher termwin_ev; 1217 xevent_watcher termwin_ev;
1162 xevent_watcher vt_ev; 1218 xevent_watcher vt_ev;
1163#ifdef HAVE_SCROLLBARS 1219#ifdef HAVE_SCROLLBARS
… …
1209 1265
1210 bool init (int argc, const char *const *argv); 1266 bool init (int argc, const char *const *argv);
1211 bool init_vars (); 1267 bool init_vars ();
1212 1268
1213 bool pty_fill (); 1269 bool pty_fill ();
1214
1215 void *operator new (size_t s);
1216 void operator delete (void *p, size_t s);
1217 1270
1218 void init_secondary (); 1271 void init_secondary ();
1219 const char **init_resources (int argc, const char *const *argv); 1272 const char **init_resources (int argc, const char *const *argv);
1220 void init_env (); 1273 void init_env ();
1221 void set_locale (const char *locale); 1274 void set_locale (const char *locale);
1222 void init_xlocale (); 1275 void init_xlocale ();
1223 void init_command (const char *const *argv); 1276 void init_command (const char *const *argv);
1224 int run_command (const char *const *argv); 1277 void run_command (const char *const *argv);
1225 int run_child (const char *const *argv); 1278 int run_child (const char *const *argv);
1226 static void child_exited (int pid);
1227 1279
1228 void color_aliases (int idx); 1280 void color_aliases (int idx);
1229 void recolour_cursor (); 1281 void recolour_cursor ();
1230 void create_windows (int argc, const char *const *argv); 1282 void create_windows (int argc, const char *const *argv);
1231 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1283 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1232 void window_calc (unsigned int width, unsigned int height); 1284 void window_calc (unsigned int width, unsigned int height);
1233 1285
1234#if USE_XIM 1286#if USE_XIM
1287 rxvt_xim *input_method;
1288 XIC Input_Context;
1289 XIMStyle input_style;
1290 XPoint spot; // most recently sent spot position
1291
1235 void im_destroy (); 1292 void im_destroy ();
1236 void im_cb (); im_watcher im_ev; 1293 void im_cb (); im_watcher im_ev;
1237 void im_set_size (XRectangle *size); 1294 void im_set_size (XRectangle &size);
1238 void im_set_position (XPoint *pos); 1295 void im_set_position (XPoint &pos);
1239 void im_set_color (unsigned long *fg, unsigned long *bg); 1296 void im_set_color (unsigned long &fg, unsigned long &bg);
1240 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect); 1297 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1241 1298
1242 bool IMisRunning (); 1299 bool IMisRunning ();
1243 void IMSendSpot (); 1300 void IMSendSpot ();
1244 bool IM_get_IC (const char *modifiers); 1301 bool IM_get_IC (const char *modifiers);
1245 void IMSetStatusPosition (); 1302 void IMSetStatusPosition ();
… …
1250 void pixel_position (int *x, int *y); 1307 void pixel_position (int *x, int *y);
1251 1308
1252 void selection_click (int clicks, int x, int y); 1309 void selection_click (int clicks, int x, int y);
1253 void selection_extend (int x, int y, int flag); 1310 void selection_extend (int x, int y, int flag);
1254 void selection_rotate (int x, int y); 1311 void selection_rotate (int x, int y);
1255
1256 /* screen (!) */
1257 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1258 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1259 int scr_scroll_text (int row1, int row2, int count, int spec);
1260 void scr_reset ();
1261 void scr_reset_realloc ();
1262 void scr_release ();
1263 void scr_clear (bool really = false);
1264 void scr_refresh (unsigned char refresh_type);
1265 bool scr_refresh_rend (rend_t mask, rend_t value);
1266 void scr_erase_screen (int mode);
1267 void scr_touch (bool refresh);
1268 void scr_expose (int x, int y, int width, int height, bool refresh);
1269 void scr_remap_chars ();
1270 void scr_remap_chars (text_t *tp, rend_t *rp);
1271 1312
1272 /* autoconvert */ 1313 /* autoconvert */
1273 1314
1274 // command.C 1315 // command.C
1275 void lookup_key (XKeyEvent &ev); 1316 void lookup_key (XKeyEvent &ev);
… …
1308 void Get_Colours (); 1349 void Get_Colours ();
1309 void get_ourmods (); 1350 void get_ourmods ();
1310 // logging.C 1351 // logging.C
1311 void makeutent (const char *pty, const char *hostname); 1352 void makeutent (const char *pty, const char *hostname);
1312 void cleanutent (); 1353 void cleanutent ();
1313 // main.C; 1354 // main.C
1314 void privileges (int mode);
1315 void privileged_utmp (char action); 1355 void privileged_utmp (rxvt_privaction action);
1316 void privileged_ttydev (char action); 1356 bool set_fonts ();
1317 bool change_font (const char *fontname);
1318 bool font_up_down (int n, int direction);
1319 void set_title (const char *str); 1357 void set_title (const char *str);
1320 void set_icon_name (const char *str); 1358 void set_icon_name (const char *str);
1321 void set_window_color (int idx, const char *color); 1359 void set_window_color (int idx, const char *color);
1322 void set_colorfgbg (); 1360 void set_colorfgbg ();
1323 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1361 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1355 void menubar_control (XButtonEvent &ev); 1393 void menubar_control (XButtonEvent &ev);
1356 void map_menuBar (int map); 1394 void map_menuBar (int map);
1357#endif 1395#endif
1358 1396
1359 // screen.C 1397 // screen.C
1398 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1399 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1400 int scr_scroll_text (int row1, int row2, int count, int spec);
1401 void scr_reset ();
1402 void scr_reset_realloc ();
1403 void scr_release ();
1404 void scr_clear (bool really = false);
1405 void scr_refresh (unsigned char refresh_type);
1406 bool scr_refresh_rend (rend_t mask, rend_t value);
1407 void scr_erase_screen (int mode);
1408 void scr_touch (bool refresh);
1409 void scr_expose (int x, int y, int width, int height, bool refresh);
1410 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1411 void scr_recolour ();
1412 void scr_remap_chars ();
1413 void scr_remap_chars (text_t *tp, rend_t *rp);
1414
1360 void scr_poweron (); 1415 void scr_poweron ();
1361 void scr_cursor (int mode); 1416 void scr_cursor (int mode);
1417 void scr_do_wrap ();
1362 int scr_change_screen (int scrn); 1418 int scr_change_screen (int scrn);
1363 void scr_color (unsigned int color, int fgbg); 1419 void scr_color (unsigned int color, int fgbg);
1364 void scr_rendition (int set, int style); 1420 void scr_rendition (int set, int style);
1365 void scr_add_lines (const unicode_t *str, int nlines, int len); 1421 void scr_add_lines (const unicode_t *str, int nlines, int len);
1366 void scr_backspace (); 1422 void scr_backspace ();
1367 void scr_tab (int count); 1423 void scr_tab (int count, bool ht = false);
1368 void scr_backindex (); 1424 void scr_backindex ();
1369 void scr_forwardindex (); 1425 void scr_forwardindex ();
1370 void scr_gotorc (int row, int col, int relative); 1426 void scr_gotorc (int row, int col, int relative);
1371 void scr_index (enum page_dirn direction); 1427 void scr_index (enum page_dirn direction);
1372 void scr_erase_line (int mode); 1428 void scr_erase_line (int mode);
… …
1384 void set_font_style (); 1440 void set_font_style ();
1385 void scr_charset_choose (int set); 1441 void scr_charset_choose (int set);
1386 void scr_charset_set (int set, unsigned int ch); 1442 void scr_charset_set (int set, unsigned int ch);
1387 int scr_move_to (int y, int len); 1443 int scr_move_to (int y, int len);
1388 int scr_page (enum page_dirn direction, int nlines); 1444 int scr_page (enum page_dirn direction, int nlines);
1389 int scr_changeview (uint16_t oldviewstart); 1445 int scr_changeview (unsigned int oldviewstart);
1390 void scr_bell (); 1446 void scr_bell ();
1391 void scr_printscreen (int fullhist); 1447 void scr_printscreen (int fullhist);
1392 void scr_reverse_selection (); 1448 void scr_reverse_selection ();
1393 void scr_dump (int fd); 1449 void scr_dump (int fd);
1394 void selection_check (int check_more); 1450 void selection_check (int check_more);
… …
1452#ifdef PROTOTYPES 1508#ifdef PROTOTYPES
1453# define __PROTO(p) p 1509# define __PROTO(p) p
1454#else 1510#else
1455# define __PROTO(p) () 1511# define __PROTO(p) ()
1456#endif 1512#endif
1457#include "protos.h"
1458 1513
1459#ifdef DEBUG_malloc 1514#ifdef DEBUG_malloc
1460# include "dmalloc.h" /* This comes last */ 1515# include "dmalloc.h" /* This comes last */
1461#endif 1516#endif
1462 1517

Diff Legend

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