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.209 by root, Mon Jan 16 15:12:48 2006 UTC vs.
Revision 1.254 by root, Thu Feb 2 18:04:46 2006 UTC

… …
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
21#else 22#else
22# define ENABLE_MINIMAL 1 23# define ENABLE_MINIMAL 1
23#endif 24#endif
24 25
… …
31#if ENABLE_FRILLS 32#if ENABLE_FRILLS
32# include <X11/Xmd.h> 33# include <X11/Xmd.h>
33#endif 34#endif
34 35
35#include "encoding.h" 36#include "encoding.h"
37#include "rxvtutil.h"
36#include "rxvtfont.h" 38#include "rxvtfont.h"
37#include "rxvttoolkit.h" 39#include "rxvttoolkit.h"
38#include "iom.h" 40#include "iom.h"
39#include "salloc.h" 41#include "salloc.h"
42#include "libptytty.h"
40 43
41#include "rxvtperl.h" 44#include "rxvtperl.h"
42 45
43// try to avoid some macros to decrease code size, on some systems 46// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 47#if ENABLE_MINIMAL
… …
94# define STDIN_FILENO 0 97# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 98# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 99# define STDERR_FILENO 2
97#endif 100#endif
98 101
102/****************************************************************************/
103
104// exception thrown on fatal (per-instance) errors
105class rxvt_failure_exception { };
106
107// exception thrown when the command parser runs out of input data
108class out_of_input { };
109
99/* 110/*
100 ***************************************************************************** 111 *****************************************************************************
101 * PROTOTYPES 112 * PROTOTYPES
102 ***************************************************************************** 113 *****************************************************************************
103 */ 114 */
104// main.C 115// main.C
105RETSIGTYPE rxvt_Child_signal (int sig); 116RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
106RETSIGTYPE rxvt_Exit_signal (int sig); 117RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
107void rxvt_clean_exit (); 118void rxvt_clean_exit () NOTHROW;
108void * rxvt_malloc (size_t size); 119void * rxvt_malloc (size_t size);
109void * rxvt_calloc (size_t number, size_t size); 120void * rxvt_calloc (size_t number, size_t size);
110void * rxvt_realloc (void *ptr, size_t size); 121void * rxvt_realloc (void *ptr, size_t size);
111void rxvt_privileges (rxvt_privaction action);
112 122
113// util.C 123// misc.C
114char * rxvt_wcstombs (const wchar_t *str, int len = -1); 124char * rxvt_wcstombs (const wchar_t *str, int len = -1);
115wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 125wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
116char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 126char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
117wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 127wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
118char * rxvt_strdup (const char *str); 128char * rxvt_strdup_cpp (const char *str);
119 129
120// misc.C 130#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
131
121char * rxvt_r_basename (const char *str); 132char * rxvt_r_basename (const char *str) NOTHROW;
122void rxvt_vlog (const char *fmt, va_list arg_ptr); 133void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
123void rxvt_log (const char *fmt,...); 134void rxvt_log (const char *fmt,...) NOTHROW;
124void rxvt_warn (const char *fmt,...); 135void rxvt_warn (const char *fmt,...) NOTHROW;
125void rxvt_fatal (const char *fmt,...); 136void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
126void rxvt_exit_failure (); 137void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
138
127int rxvt_Str_match (const char *s1, const char *s2); 139int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
128const char * rxvt_Str_skip_space (const char *str); 140const char * rxvt_Str_skip_space (const char *str) NOTHROW;
129char * rxvt_Str_trim (char *str); 141char * rxvt_Str_trim (char *str) NOTHROW;
130int rxvt_Str_escaped (char *str); 142int rxvt_Str_escaped (char *str) NOTHROW;
131char ** rxvt_splitcommastring (const char *cs); 143char ** rxvt_splitcommastring (const char *cs) NOTHROW;
132void rxvt_freecommastring (char **cs); 144void rxvt_freecommastring (char **cs) NOTHROW;
133char * rxvt_File_find (const char *file, const char *ext, const char *path); 145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
134void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
135void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
136void rxvt_usleep (int usecs);
137 146
138///////////////////////////////////////////////////////////////////////////// 147/////////////////////////////////////////////////////////////////////////////
139 148
140// temporarily replace the process environment 149// temporarily replace the process environment
141extern char **environ; 150extern char **environ;
142extern char **rxvt_environ; // the original environ pointer 151extern char **rxvt_environ; // the original environ pointer
143 152
144inline void set_environ (stringvec *envv) 153inline void set_environ (stringvec *envv)
145{ 154{
155#if ENABLE_PERL
156 assert (envv);
157#else
146 if (envv) 158 if (envv)
159#endif
147 environ = (char **)envv->begin (); 160 environ = (char **)envv->begin ();
148} 161}
149 162
150inline void set_environ (char **envv) 163inline void set_environ (char **envv)
151{ 164{
165#if ENABLE_PERL
166 assert (envv);
167#else
152 if (envv) 168 if (envv)
169#endif
153 environ = envv; 170 environ = envv;
154} 171}
155 172
156/* 173/*
157 ***************************************************************************** 174 *****************************************************************************
… …
338 * | 355 * |
339 * +---< SB_WIDTH_NEXT 356 * +---< SB_WIDTH_NEXT
340 */ 357 */
341 358
342enum { 359enum {
343 NO_REFRESH = 0 , /* Window not visible at all! */ 360 NO_REFRESH = 0, /* Window not visible at all! */
344 FAST_REFRESH = 1<<0, /* Fully exposed window */ 361 FAST_REFRESH = 1, /* Fully exposed window */
345 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 362 SLOW_REFRESH = 2, /* Partially exposed window */
346 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
347}; 363};
348 364
349#ifdef NO_SECONDARY_SCREEN 365#ifdef NO_SECONDARY_SCREEN
350# define NSCREENS 0 366# define NSCREENS 0
351#else 367#else
… …
395 411
396// fake styles 412// fake styles
397#define RS_Blink 0x00010000UL // blink 413#define RS_Blink 0x00010000UL // blink
398#define RS_RVid 0x00020000UL // reverse video 414#define RS_RVid 0x00020000UL // reverse video
399#define RS_Uline 0x00040000UL // underline 415#define RS_Uline 0x00040000UL // underline
416
417// toggle this to force redraw, must be != RS_Careful
418#define RS_redraw 0x01000000UL
400 419
401// 5 custom bits for extensions 420// 5 custom bits for extensions
402#define RS_customCount 32 421#define RS_customCount 32
403#define RS_customMask 0x00f80000UL 422#define RS_customMask 0x00f80000UL
404#define RS_customShift 19 423#define RS_customShift 19
… …
474 Rxvt_restoreFG = 39, // change default fg color 493 Rxvt_restoreFG = 39, // change default fg color
475 Rxvt_restoreBG = 49, // change default bg color 494 Rxvt_restoreBG = 49, // change default bg color
476 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 495 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
477 496
478 URxvt_locale = 701, // change locale 497 URxvt_locale = 701, // change locale
498 URxvt_version = 702, // request version
479 499
480 URxvt_Color_IT = 704, // change actual 'Italic' colour 500 URxvt_Color_IT = 704, // change actual 'Italic' colour
481 URxvt_Color_tint = 705, // change actual tint colour 501 URxvt_Color_tint = 705, // change actual tint colour
482 URxvt_Color_BD = 706, 502 URxvt_Color_BD = 706,
483 URxvt_Color_UL = 707, 503 URxvt_Color_UL = 707,
… …
568#endif 588#endif
569}; 589};
570 590
571#define Color_Bits 7 // 0 .. maxTermCOLOR 591#define Color_Bits 7 // 0 .. maxTermCOLOR
572 592
573#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
574#define NPIXCLR_BITS 32
575
576/* 593/*
577 * Resource list 594 * Resource list
578 */ 595 */
579enum { 596enum {
580# define def(name) Rs_ ## name, 597# define def(name) Rs_ ## name,
581# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 598# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
582# include "rsinc.h" 599# include "rsinc.h"
583# undef def 600# undef def
584# undef reserve 601# undef reserve
585 NUM_RESOURCES 602 NUM_RESOURCES
586};
587
588// see init.C:xa_names, which must be kept in sync
589enum {
590 XA_TEXT = 0,
591 XA_COMPOUND_TEXT,
592 XA_UTF8_STRING,
593 XA_MULTIPLE,
594 XA_TARGETS,
595 XA_TIMESTAMP,
596 XA_VT_SELECTION,
597 XA_INCR,
598 XA_WM_PROTOCOLS,
599 XA_WM_DELETE_WINDOW,
600 XA_CLIPBOARD,
601#if ENABLE_FRILLS
602 XA_MOTIF_WM_HINTS,
603#endif
604#if ENABLE_EWMH
605 XA_NET_WM_PID,
606 XA_NET_WM_NAME,
607 XA_NET_WM_ICON_NAME,
608 XA_NET_WM_PING,
609#endif
610#if USE_XIM
611 XA_WM_LOCALE_NAME,
612#endif
613#if TRANSPARENT
614 XA_XROOTPMAP_ID,
615 XA_ESETROOT_PMAP_ID,
616#endif
617#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
618 XA_DNDPROTOCOL,
619 XA_DNDSELECTION,
620#endif
621#if ENABLE_XEMBED
622 XA_XEMBED,
623 XA_XEMBED_INFO,
624#endif
625 NUM_XA
626}; 603};
627 604
628/* DEC private modes */ 605/* DEC private modes */
629#define PrivMode_132 (1UL<<0) 606#define PrivMode_132 (1UL<<0)
630#define PrivMode_132OK (1UL<<1) 607#define PrivMode_132OK (1UL<<1)
… …
702/* 679/*
703 ***************************************************************************** 680 *****************************************************************************
704 * MACRO DEFINES 681 * MACRO DEFINES
705 ***************************************************************************** 682 *****************************************************************************
706 */ 683 */
707#define dDisp Display *disp = display->display 684#define dLocal(type,name) type const name = this->name
685
686// for speed reasons, we assume that all latin1 characters
687// are single-width (the first unicode combining character
688// is actually 0x300, but ascii is what matters most).
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
708 690
709/* convert pixel dimensions to row/column values. Everything as int32_t */ 691/* convert pixel dimensions to row/column values. Everything as int32_t */
710#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 692#define Pixel2Col(x) Pixel2Width((int32_t)(x))
711#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 693#define Pixel2Row(y) Pixel2Height((int32_t)(y))
712#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
746#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 728#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
747#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 729#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
748 730
749#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 731#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
750 732
751#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 733#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
752#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 734#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
753 735
754#if ENABLE_STYLES 736#if ENABLE_STYLES
755# define FONTSET(style) fontset[GET_STYLE (style)] 737# define FONTSET(style) fontset[GET_STYLE (style)]
756#else 738#else
757# define FONTSET(style) fontset[0] 739# define FONTSET(style) fontset[0]
… …
791# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 773# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
792#else 774#else
793# define XPMClearArea(a, b, c, d, e, f, g) 775# define XPMClearArea(a, b, c, d, e, f, g)
794#endif 776#endif
795 777
796#ifdef UTMP_SUPPORT
797# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
798# undef HAVE_UTMPX_H
799# undef HAVE_STRUCT_UTMPX
800# endif
801# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
802# undef HAVE_UTMP_H
803# undef HAVE_STRUCT_UTMP
804# endif
805
806# ifdef HAVE_UTMPX_H
807# include <utmpx.h>
808# endif
809# ifdef HAVE_UTMP_H
810# include <utmp.h>
811# endif
812#endif
813
814#ifdef DEBUG_CMD
815# define D_CMD(x) fprintf x ; fputc('\n', stderr)
816#else
817# define D_CMD(x)
818#endif
819#ifdef DEBUG_INIT
820# define D_INIT(x) fprintf x ; fputc('\n', stderr)
821#else
822# define D_INIT(x)
823#endif
824#ifdef DEBUG_MAIN
825# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
826#else
827# define D_MAIN(x)
828#endif
829#ifdef DEBUG_SIZE
830# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
831#else
832# define D_SIZE(x)
833#endif
834
835extern class rxvt_failure_exception { } rxvt_failure_exception;
836
837typedef callback1<void, const char *> log_callback; 778typedef callback1<void, const char *> log_callback;
838typedef callback1<int, int> getfd_callback; 779typedef callback1<int, int> getfd_callback;
839 780
840extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
841extern void rxvt_log (const char *fmt, ...);
842extern void rxvt_warn (const char *fmt, ...);
843extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
844extern void rxvt_exit_failure () __attribute__ ((noreturn));
845
846#define SET_LOCALE(locale) rxvt_set_locale (locale) 781#define SET_LOCALE(locale) rxvt_set_locale (locale)
847extern bool rxvt_set_locale (const char *locale); 782extern bool rxvt_set_locale (const char *locale) NOTHROW;
848extern void rxvt_push_locale (const char *locale); 783extern void rxvt_push_locale (const char *locale) NOTHROW;
849extern void rxvt_pop_locale (); 784extern void rxvt_pop_locale () NOTHROW;
850
851/****************************************************************************/
852
853#define BLINK_INTERVAL 0.5
854#define TEXT_BLINK_INTERVAL 0.5
855
856#ifndef __attribute__
857# ifdef __GNUC__
858# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
859# define __attribute__(x)
860# endif
861# endif
862# define __attribute__(x)
863#endif
864 785
865/****************************************************************************/ 786/****************************************************************************/
866 787
867#define LINE_LONGER 0x0001 // line is continued on the next row 788#define LINE_LONGER 0x0001 // line is continued on the next row
868#define LINE_FILTERED 0x0002 // line has been filtered 789#define LINE_FILTERED 0x0002 // line has been filtered
… …
928# define COMPOSE_LO 0x40000000UL 849# define COMPOSE_LO 0x40000000UL
929# define COMPOSE_HI 0x400fffffUL 850# define COMPOSE_HI 0x400fffffUL
930# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 851# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
931#else 852#else
932# if ENABLE_PERL 853# if ENABLE_PERL
933# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 854# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
934# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 855# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
935# else 856# else
936# define COMPOSE_LO 0xd800UL 857# define COMPOSE_LO 0xd800UL
937# define COMPOSE_HI 0xf8ffUL 858# define COMPOSE_HI 0xf8ffUL
938# endif 859# endif
… …
967#endif 888#endif
968 889
969/****************************************************************************/ 890/****************************************************************************/
970 891
971#ifdef KEYSYM_RESOURCE 892#ifdef KEYSYM_RESOURCE
972 class keyboard_manager; 893class keyboard_manager;
973#endif 894#endif
974 895
975struct rxvt_term : zero_initialized, rxvt_vars { 896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
897
898 // special markers with magic addresses
899 static const char resval_undef []; // options specifically unset
900 static const char resval_on []; // boolean options switched on
901 static const char resval_off []; // or off
902
976 log_callback *log_hook; // log error messages through this hook, if != 0 903 log_callback *log_hook; // log error messages through this hook, if != 0
977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 904 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
978#if ENABLE_PERL 905#if ENABLE_PERL
979 rxvt_perl_term perl; 906 rxvt_perl_term perl;
980#endif 907#endif
981 struct mbstate mbstate; // current input multibyte state 908 struct mbstate mbstate; // current input multibyte state
… …
987#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 914#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
988 am_transparent:1, /* is a transparent term */ 915 am_transparent:1, /* is a transparent term */
989 am_pixmap_trans:1, /* transparency w/known root pixmap */ 916 am_pixmap_trans:1, /* transparency w/known root pixmap */
990#endif 917#endif
991 current_screen:1, /* primary or secondary */ 918 current_screen:1, /* primary or secondary */
992 hate_those_clicks:1, /* a.k.a. keep mark position */
993 num_scr_allow:1, 919 num_scr_allow:1,
994 bypass_keystate:1, 920 bypass_keystate:1,
995#ifdef CURSOR_BLINK 921#ifdef CURSOR_BLINK
996 hidden_cursor:1, 922 hidden_cursor:1,
997#endif 923#endif
… …
1012#endif 938#endif
1013 scrollbar_align, 939 scrollbar_align,
1014 selection_wait, 940 selection_wait,
1015 selection_type; 941 selection_type;
1016/* ---------- */ 942/* ---------- */
943 bool rvideo_state, rvideo_mode;
944#ifndef NO_BELL
1017 short rvideo; 945 bool rvideo_bell;
946#endif
1018 int num_scr; /* screen: number lines scrolled */ 947 int num_scr; /* screen: number lines scrolled */
1019 int prev_ncol, /* screen: previous number of columns */ 948 int prev_ncol, /* screen: previous number of columns */
1020 prev_nrow; /* screen: previous number of rows */ 949 prev_nrow; /* screen: previous number of rows */
1021/* ---------- */ 950/* ---------- */
1022 rend_t rstyle; 951 rend_t rstyle;
1023/* ---------- */
1024 uint32_t pixcolor_set[NPIXCLR_SETS];
1025/* ---------- */ 952/* ---------- */
1026#ifdef SELECTION_SCROLLING 953#ifdef SELECTION_SCROLLING
1027 int scroll_selection_lines; 954 int scroll_selection_lines;
1028 enum page_dirn scroll_selection_dir; 955 enum page_dirn scroll_selection_dir;
1029 int selection_save_x, 956 int selection_save_x,
… …
1056 int old_width, /* last used width in screen resize */ 983 int old_width, /* last used width in screen resize */
1057 old_height; /* last used height in screen resize */ 984 old_height; /* last used height in screen resize */
1058 unsigned long priv_modes, 985 unsigned long priv_modes,
1059 SavedModes; 986 SavedModes;
1060/* ---------- */ 987/* ---------- */
1061 Atom xa[NUM_XA]; 988 Atom *xa;
1062/* ---------- */ 989/* ---------- */
1063#ifdef RXVT_SCROLLBAR 990#ifdef RXVT_SCROLLBAR
1064 GC scrollbarGC, 991 GC scrollbarGC,
1065 topShadowGC, 992 topShadowGC,
1066 botShadowGC; 993 botShadowGC;
… …
1100 const char *key_delete; 1027 const char *key_delete;
1101#endif 1028#endif
1102 struct mouse_event MEvent; 1029 struct mouse_event MEvent;
1103 XComposeStatus compose; 1030 XComposeStatus compose;
1104 ttymode_t tio; 1031 ttymode_t tio;
1105#ifdef UTMP_SUPPORT
1106# ifdef HAVE_STRUCT_UTMP
1107 struct utmp ut;
1108# endif
1109# ifdef HAVE_STRUCT_UTMPX
1110 struct utmpx utx;
1111# endif
1112# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1113 char ut_id[5];
1114# endif
1115 int utmp_pos;
1116#endif
1117 row_col_t oldcursor; 1032 row_col_t oldcursor;
1118#ifdef XPM_BACKGROUND 1033#ifdef XPM_BACKGROUND
1119 bgPixmap_t bgPixmap; 1034 bgPixmap_t bgPixmap;
1120 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1035 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1121#endif 1036#endif
… …
1123#if ENABLE_OVERLAY 1038#if ENABLE_OVERLAY
1124 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1039 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1125 text_t **ov_text; 1040 text_t **ov_text;
1126 rend_t **ov_rend; 1041 rend_t **ov_rend;
1127 1042
1128 void scr_swap_overlay (); 1043 void scr_swap_overlay () NOTHROW;
1129 void scr_overlay_new (int x, int y, int w, int h); 1044 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1130 void scr_overlay_off (); 1045 void scr_overlay_off () NOTHROW;
1131 void scr_overlay_set (int x, int y, 1046 void scr_overlay_set (int x, int y,
1132 text_t text, 1047 text_t text,
1133 rend_t rend = OVERLAY_RSTYLE); 1048 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1134 void scr_overlay_set (int x, int y, const char *s); 1049 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1135 void scr_overlay_set (int x, int y, const wchar_t *s); 1050 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1136#endif 1051#endif
1137 1052
1138 vector<void *> allocated; // free these memory blocks with free() 1053 vector<void *> allocated; // free these memory blocks with free()
1139 1054
1140 char *env_windowid; /* environmental variable WINDOWID */ 1055 char env_windowid[21]; /* environmental variable WINDOWID */
1056 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1141 char *env_display; /* environmental variable DISPLAY */ 1057 char *env_display; /* environmental variable DISPLAY */
1142 char *env_term; /* environmental variable TERM */ 1058 char *env_term; /* environmental variable TERM */
1143 char *env_colorfgbg; 1059
1144 char *locale; 1060 char *locale;
1145 char charsets[4]; 1061 char charsets[4];
1146 char *v_buffer; /* pointer to physical buffer */ 1062 char *v_buffer; /* pointer to physical buffer */
1147 unsigned int v_buflen; /* size of area to write */ 1063 unsigned int v_buflen; /* size of area to write */
1148 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1064 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1149 1065
1150#ifdef KEYSYM_RESOURCE 1066#ifdef KEYSYM_RESOURCE
1151 keyboard_manager *keyboard; 1067 keyboard_manager *keyboard;
1152#endif 1068#endif
1153 1069
1154 const char *rs[NUM_RESOURCES]; 1070 const char *rs[NUM_RESOURCES];
1155 /* command input buffering */ 1071 /* command input buffering */
1156 char *cmdbuf_ptr, *cmdbuf_endp; 1072 char *cmdbuf_ptr, *cmdbuf_endp;
1157 char cmdbuf_base[CBUFSIZ]; 1073 char cmdbuf_base[CBUFSIZ];
1074
1075 ptytty *pty;
1158 1076
1159 rxvt_salloc *talloc; // text line allocator 1077 rxvt_salloc *talloc; // text line allocator
1160 rxvt_salloc *ralloc; // rend line allocator 1078 rxvt_salloc *ralloc; // rend line allocator
1161 1079
1162 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1080 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1171 void iso14755_54 (int x, int y); 1089 void iso14755_54 (int x, int y);
1172# endif 1090# endif
1173#endif 1091#endif
1174 1092
1175 // modifies first argument(!) 1093 // modifies first argument(!)
1176 void paste (char *data, unsigned int len); 1094 void paste (char *data, unsigned int len) NOTHROW;
1177 1095
1178 long vt_emask, vt_emask_perl; 1096 long vt_emask, vt_emask_perl, vt_emask_xim;
1179 1097
1180 void vt_select_input () const 1098 void vt_select_input () const NOTHROW
1181 { 1099 {
1182 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1183 } 1101 }
1184 1102
1185#if TRANSPARENT 1103#if TRANSPARENT
1186 void rootwin_cb (XEvent &xev); 1104 void rootwin_cb (XEvent &xev);
1187 xevent_watcher rootwin_ev; 1105 xevent_watcher rootwin_ev;
… …
1193 xevent_watcher vt_ev; 1111 xevent_watcher vt_ev;
1194#ifdef HAVE_SCROLLBARS 1112#ifdef HAVE_SCROLLBARS
1195 xevent_watcher scrollbar_ev; 1113 xevent_watcher scrollbar_ev;
1196#endif 1114#endif
1197 1115
1116 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1198 void check_cb (check_watcher &w); check_watcher check_ev; 1117 void check_cb (check_watcher &w); check_watcher check_ev;
1199 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1118 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1200 void flush_cb (time_watcher &w); time_watcher flush_ev; 1119 void flush_cb (time_watcher &w); time_watcher flush_ev;
1201
1202 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1120 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1203
1204 void incr_cb (time_watcher &w); time_watcher incr_ev; 1121 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1205 1122
1206#ifdef CURSOR_BLINK 1123#ifdef CURSOR_BLINK
1207 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1124 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1208#endif 1125#endif
1209#ifdef TEXT_BLINK 1126#ifdef TEXT_BLINK
1210 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1127 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1128#endif
1129#ifndef NO_BELL
1130 void bell_cb (time_watcher &w); time_watcher bell_ev;
1211#endif 1131#endif
1212 1132
1213#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1133#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1214 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1134 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1215#endif 1135#endif
… …
1232 1152
1233 void tt_winch (); 1153 void tt_winch ();
1234 1154
1235 rxvt_term (); 1155 rxvt_term ();
1236 ~rxvt_term (); 1156 ~rxvt_term ();
1237 void child_exit (); // child has exited, usually destroys
1238 void destroy (); 1157 void destroy ();
1239 void emergency_cleanup (); 1158 void emergency_cleanup ();
1240 1159
1241 bool init (int argc, const char *const *argv); 1160 bool init (int argc, const char *const *argv, stringvec *envv);
1161
1162 bool init (stringvec *argv, stringvec *envv)
1163 {
1164 this->argv = argv;
1165 return init (argv->size (), argv->begin (), envv);
1166 }
1167
1242 bool init_vars (); 1168 bool init_vars ();
1243 1169
1244 bool pty_fill (); 1170 bool pty_fill ();
1245 1171
1246 void make_current () const // make this the "currently active" urxvt instance 1172 void make_current () const // make this the "currently active" urxvt instance
… …
1265 void create_windows (int argc, const char *const *argv); 1191 void create_windows (int argc, const char *const *argv);
1266 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1192 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1267 void window_calc (unsigned int newwidth, unsigned int newheight); 1193 void window_calc (unsigned int newwidth, unsigned int newheight);
1268 1194
1269#if USE_XIM 1195#if USE_XIM
1270 rxvt_xim *input_method; 1196 rxvt_xim *input_method;
1271 XIC Input_Context; 1197 XIC Input_Context;
1272 XIMStyle input_style; 1198 XIMStyle input_style;
1273 XPoint spot; // most recently sent spot position 1199 XPoint spot; // most recently sent spot position
1274 1200
1275 void im_destroy (); 1201 void im_destroy ();
1276 void im_cb (); im_watcher im_ev; 1202 void im_cb (); im_watcher im_ev;
1277 void im_set_size (XRectangle &size); 1203 void im_set_size (XRectangle &size);
1278 void im_set_position (XPoint &pos); 1204 void im_set_position (XPoint &pos) NOTHROW;
1279 void im_set_color (unsigned long &fg, unsigned long &bg); 1205 void im_set_color (unsigned long &fg, unsigned long &bg);
1280 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1206 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1281 1207
1282 bool IMisRunning (); 1208 bool IMisRunning ();
1283 void IMSendSpot (); 1209 void IMSendSpot ();
… …
1285 void IMSetStatusPosition (); 1211 void IMSetStatusPosition ();
1286#endif 1212#endif
1287 1213
1288 void resize_scrollbar (); 1214 void resize_scrollbar ();
1289 1215
1290 void pixel_position (int *x, int *y);
1291
1292 void selection_click (int clicks, int x, int y);
1293 void selection_extend (int x, int y, int flag);
1294 void selection_rotate (int x, int y);
1295
1296 /* autoconvert */
1297
1298 // command.C 1216 // command.C
1299 void lookup_key (XKeyEvent &ev); 1217 void lookup_key (XKeyEvent &ev);
1300 unsigned int cmd_write (const char *str, unsigned int count); 1218 unsigned int cmd_write (const char *str, unsigned int count);
1301 1219
1302 wchar_t next_char (); 1220 wchar_t next_char () NOTHROW;
1303 wchar_t cmd_getc (); 1221 wchar_t cmd_getc () THROW ((class out_of_input));
1304 uint32_t next_octet (); 1222 uint32_t next_octet () NOTHROW;
1305 uint32_t cmd_get8 (); 1223 uint32_t cmd_get8 () THROW ((class out_of_input));
1306 1224
1307 bool cmd_parse (); 1225 bool cmd_parse ();
1308 void mouse_report (XButtonEvent &ev); 1226 void mouse_report (XButtonEvent &ev);
1309 void button_press (XButtonEvent &ev); 1227 void button_press (XButtonEvent &ev);
1310 void button_release (XButtonEvent &ev); 1228 void button_release (XButtonEvent &ev);
… …
1331 void process_sgr_mode (unsigned int nargs, const int *arg); 1249 void process_sgr_mode (unsigned int nargs, const int *arg);
1332 void process_graphics (); 1250 void process_graphics ();
1333 // init.C 1251 // init.C
1334 void Get_Colours (); 1252 void Get_Colours ();
1335 void get_ourmods (); 1253 void get_ourmods ();
1336 // logging.C
1337 void makeutent (const char *pty, const char *hostname);
1338 void cleanutent ();
1339 // main.C 1254 // main.C
1340 void privileged_utmp (rxvt_privaction action);
1341 bool set_fonts (); 1255 bool set_fonts ();
1342 void set_string_property (Atom prop, const char *str, int len = -1); 1256 void set_string_property (Atom prop, const char *str, int len = -1);
1343 void set_utf8_property (Atom prop, const char *str, int len = -1); 1257 void set_utf8_property (Atom prop, const char *str, int len = -1);
1344 void set_title (const char *str); 1258 void set_title (const char *str);
1345 void set_icon_name (const char *str); 1259 void set_icon_name (const char *str);
1346 void set_window_color (int idx, const char *color); 1260 void set_window_color (int idx, const char *color);
1347 void set_colorfgbg (); 1261 void set_colorfgbg ();
1348 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1262 bool set_color (rxvt_color &color, const char *name);
1263 void alias_color (int dst, int src);
1349 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1264 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1350 1265
1351 // screen.C 1266 // screen.C
1352 1267
1353 void lalloc (line_t &l) const 1268 void lalloc (line_t &l) const
… …
1376 1291
1377 if (ncol > prev_ncol) 1292 if (ncol > prev_ncol)
1378 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1293 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1379 } 1294 }
1380 1295
1381 int fgcolor_of (rend_t r) const 1296 int fgcolor_of (rend_t r) const NOTHROW
1382 { 1297 {
1383 int base = GET_BASEFG (r); 1298 int base = GET_BASEFG (r);
1384#ifndef NO_BRIGHTCOLOR 1299#ifndef NO_BRIGHTCOLOR
1385 if (r & RS_Bold 1300 if (r & RS_Bold
1386# if ENABLE_STYLES 1301# if ENABLE_STYLES
… …
1390 base += minBrightCOLOR - minCOLOR; 1305 base += minBrightCOLOR - minCOLOR;
1391#endif 1306#endif
1392 return base; 1307 return base;
1393 } 1308 }
1394 1309
1395 int bgcolor_of (rend_t r) const 1310 int bgcolor_of (rend_t r) const NOTHROW
1396 { 1311 {
1397 int base = GET_BASEBG (r); 1312 int base = GET_BASEBG (r);
1398#ifndef NO_BRIGHTCOLOR 1313#ifndef NO_BRIGHTCOLOR
1399 if (r & RS_Blink 1314 if (r & RS_Blink
1400# if ENABLE_STYLES 1315# if ENABLE_STYLES
… …
1404 base += minBrightCOLOR - minCOLOR; 1319 base += minBrightCOLOR - minCOLOR;
1405#endif 1320#endif
1406 return base; 1321 return base;
1407 } 1322 }
1408 1323
1409 bool option (uint32_t opt) const 1324 bool option (uint32_t opt) const NOTHROW
1410 { 1325 {
1411 return OPTION (opt); 1326 return OPTION (opt);
1412 } 1327 }
1413 1328
1414 void set_option (uint32_t opt, bool set) 1329 void set_option (uint32_t opt, bool set) NOTHROW
1415 { 1330 {
1416 if (set) 1331 if (set)
1417 options |= opt; 1332 options |= opt;
1418 else 1333 else
1419 options &= ~opt; 1334 options &= ~opt;
1420 } 1335 }
1421 1336
1422 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1337 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1423 void scr_blank_screen_mem (line_t &l, rend_t efs) const; 1338 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1424 int scr_scroll_text (int row1, int row2, int count); 1339 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1425 void scr_reset (); 1340 void scr_reset ();
1426 void scr_release (); 1341 void scr_release () NOTHROW;
1427 void scr_clear (bool really = false); 1342 void scr_clear (bool really = false) NOTHROW;
1428 void scr_refresh (unsigned char refresh_type); 1343 void scr_refresh () NOTHROW;
1429 bool scr_refresh_rend (rend_t mask, rend_t value); 1344 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1430 void scr_erase_screen (int mode); 1345 void scr_erase_screen (int mode) NOTHROW;
1431#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1432 void scr_erase_savelines (); 1347 void scr_erase_savelines () NOTHROW;
1433 void scr_backindex (); 1348 void scr_backindex () NOTHROW;
1434 void scr_forwardindex (); 1349 void scr_forwardindex () NOTHROW;
1435#endif 1350#endif
1436 void scr_touch (bool refresh); 1351 void scr_touch (bool refresh) NOTHROW;
1437 void scr_expose (int x, int y, int width, int height, bool refresh); 1352 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1438 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1353 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1439 void scr_recolour (); 1354 void scr_recolour () NOTHROW;
1440 void scr_remap_chars (); 1355 void scr_remap_chars () NOTHROW;
1441 void scr_remap_chars (line_t &l); 1356 void scr_remap_chars (line_t &l) NOTHROW;
1357
1358 enum cursor_mode { SAVE, RESTORE };
1442 1359
1443 void scr_poweron (); 1360 void scr_poweron ();
1444 void scr_cursor (int mode); 1361 void scr_cursor (cursor_mode mode) NOTHROW;
1445 void scr_do_wrap (); 1362 void scr_do_wrap () NOTHROW;
1363 void scr_swap_screen () NOTHROW;
1446 int scr_change_screen (int scrn); 1364 void scr_change_screen (int scrn);
1447 void scr_color (unsigned int color, int fgbg); 1365 void scr_color (unsigned int color, int fgbg) NOTHROW;
1448 void scr_rendition (int set, int style); 1366 void scr_rendition (int set, int style) NOTHROW;
1449 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1367 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1450 void scr_backspace (); 1368 void scr_backspace () NOTHROW;
1451 void scr_tab (int count, bool ht = false); 1369 void scr_tab (int count, bool ht = false) NOTHROW;
1452 void scr_gotorc (int row, int col, int relative); 1370 void scr_gotorc (int row, int col, int relative) NOTHROW;
1453 void scr_index (enum page_dirn direction); 1371 void scr_index (enum page_dirn direction) NOTHROW;
1454 void scr_erase_line (int mode); 1372 void scr_erase_line (int mode) NOTHROW;
1455 void scr_E (); 1373 void scr_E () NOTHROW;
1456 void scr_insdel_lines (int count, int insdel); 1374 void scr_insdel_lines (int count, int insdel) NOTHROW;
1457 void scr_insdel_chars (int count, int insdel); 1375 void scr_insdel_chars (int count, int insdel) NOTHROW;
1458 void scr_scroll_region (int top, int bot); 1376 void scr_scroll_region (int top, int bot) NOTHROW;
1459 void scr_cursor_visible (int mode); 1377 void scr_cursor_visible (int mode) NOTHROW;
1460 void scr_autowrap (int mode); 1378 void scr_autowrap (int mode) NOTHROW;
1461 void scr_relative_origin (int mode); 1379 void scr_relative_origin (int mode) NOTHROW;
1462 void scr_insert_mode (int mode); 1380 void scr_insert_mode (int mode) NOTHROW;
1463 void scr_set_tab (int mode); 1381 void scr_set_tab (int mode) NOTHROW;
1464 void scr_rvideo_mode (int mode); 1382 void scr_rvideo_mode (bool on) NOTHROW;
1465 void scr_report_position (); 1383 void scr_report_position () NOTHROW;
1466 void set_font_style (); 1384 void set_font_style () NOTHROW;
1467 void scr_charset_choose (int set); 1385 void scr_charset_choose (int set) NOTHROW;
1468 void scr_charset_set (int set, unsigned int ch); 1386 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1469 void scr_move_to (int y, int len); 1387 void scr_move_to (int y, int len) NOTHROW;
1470 bool scr_page (enum page_dirn direction, int nlines); 1388 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1471 bool scr_changeview (int new_view_start); 1389 bool scr_changeview (int new_view_start) NOTHROW;
1472 void scr_bell (); 1390 void scr_bell () NOTHROW;
1473 void scr_printscreen (int fullhist); 1391 void scr_printscreen (int fullhist) NOTHROW;
1474 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1392 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1475 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1393 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1476 void scr_reverse_selection (); 1394 void scr_reverse_selection () NOTHROW;
1477 void scr_dump (int fd); 1395 void scr_dump (int fd) NOTHROW;
1396
1478 void selection_check (int check_more); 1397 void selection_check (int check_more) NOTHROW;
1479 void selection_paste (Window win, Atom prop, bool delete_prop); 1398 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1480 void selection_property (Window win, Atom prop); 1399 void selection_property (Window win, Atom prop) NOTHROW;
1481 void selection_request (Time tm, int x, int y); 1400 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1482 int selection_request_other (Atom target, int selnum); 1401 int selection_request_other (Atom target, int selnum) NOTHROW;
1483 void selection_clear (); 1402 void selection_clear () NOTHROW;
1484 void selection_make (Time tm); 1403 void selection_make (Time tm);
1485 bool selection_grab (Time tm); 1404 bool selection_grab (Time tm) NOTHROW;
1486 void selection_start_colrow (int col, int row); 1405 void selection_start_colrow (int col, int row) NOTHROW;
1487 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1406 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1488 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1407 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1489 void selection_remove_trailing_spaces (); 1408 void selection_remove_trailing_spaces () NOTHROW;
1490 void selection_send (const XSelectionRequestEvent &rq); 1409 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1410 void selection_click (int clicks, int x, int y) NOTHROW;
1411 void selection_extend (int x, int y, int flag) NOTHROW;
1412 void selection_rotate (int x, int y) NOTHROW;
1413
1414 void pixel_position (int *x, int *y) NOTHROW;
1491 1415
1492#if defined(NEXT_SCROLLBAR) 1416#if defined(NEXT_SCROLLBAR)
1493 // scrollbar-next.C 1417 // scrollbar-next.C
1494 Pixmap renderPixmap (const char *const *data, int width, int height); 1418 Pixmap renderPixmap (const char *const *data, int width, int height);
1495 void init_scrollbar_stuff (); 1419 void init_scrollbar_stuff ();
… …
1497 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1421 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1498#endif 1422#endif
1499 1423
1500#if defined(RXVT_SCROLLBAR) 1424#if defined(RXVT_SCROLLBAR)
1501 // scrollbar-rxvt.C 1425 // scrollbar-rxvt.C
1502 void Draw_button (int x, int y, int state, int dirn);
1503 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1426 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1504#endif 1427#endif
1505 1428
1506#if defined(XTERM_SCROLLBAR) 1429#if defined(XTERM_SCROLLBAR)
1507 // scrollbar-xterm.C 1430 // scrollbar-xterm.C
… …
1538# define __PROTO(p) p 1461# define __PROTO(p) p
1539#else 1462#else
1540# define __PROTO(p) () 1463# define __PROTO(p) ()
1541#endif 1464#endif
1542 1465
1543#ifdef DEBUG_malloc
1544# include "dmalloc.h" /* This comes last */
1545#endif
1546
1547#endif /* _RXVT_H_ */ 1466#endif /* _RXVT_H_ */
1548 1467

Diff Legend

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