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.126 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.176 by root, Sat Dec 31 19:30:25 2005 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 *****************************************************************************
… …
80/* 86/*
81 ***************************************************************************** 87 *****************************************************************************
82 * PROTOTYPES 88 * PROTOTYPES
83 ***************************************************************************** 89 *****************************************************************************
84 */ 90 */
91// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 92RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 93RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 94void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 95void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 96void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 97void * rxvt_realloc (void *ptr, size_t size);
98void rxvt_privileges (rxvt_privaction action);
99
100// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len); 101char * rxvt_wcstombs (const wchar_t *str, int len = -1);
102wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
103char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
104wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
92char * rxvt_strdup (const char *str); 105char * rxvt_strdup (const char *str);
106
107// misc.C
93char * rxvt_r_basename (const char *str); 108char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr); 109void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...); 110void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...); 111void rxvt_warn (const char *fmt,...);
97void rxvt_fatal (const char *fmt,...); 112void rxvt_fatal (const char *fmt,...);
… …
103char ** rxvt_splitcommastring (const char *cs); 118char ** rxvt_splitcommastring (const char *cs);
104void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
105char * rxvt_File_find (const char *file, const char *ext, const char *path); 120char * 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); 121void 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); 122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
108 123void rxvt_usleep (int usecs);
109void rxvt_privileges (rxvt_privaction action);
110 124
111/* 125/*
112 ***************************************************************************** 126 *****************************************************************************
113 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
114 ***************************************************************************** 128 *****************************************************************************
… …
124#endif 138#endif
125 139
126/* If we're using either the rxvt scrollbar or menu bars, keep the 140/* If we're using either the rxvt scrollbar or menu bars, keep the
127 * scrollColor resource. 141 * scrollColor resource.
128 */ 142 */
129#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
130# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
131#else 145#else
132# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
133#endif 147#endif
134 148
135#ifdef XPM_BACKGROUND 149#ifdef XPM_BACKGROUND
136typedef struct { 150typedef struct {
137 short w, h, x, y; 151 short w, h, x, y;
138 Pixmap pixmap; 152 Pixmap pixmap;
139} bgPixmap_t; 153} bgPixmap_t;
140#endif 154#endif
141 155
142/* 156/*
143 * the 'essential' information for reporting Mouse Events 157 * the 'essential' information for reporting Mouse Events
144 * pared down from XButtonEvent 158 * pared down from XButtonEvent
145 */ 159 */
146struct mouse_event { 160struct mouse_event {
147 int clicks; 161 int clicks;
148 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
149 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
150 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
151}; 165};
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 166
165#if ENABLE_FRILLS 167#if ENABLE_FRILLS
166typedef struct _mwmhints { 168typedef struct _mwmhints {
167 CARD32 flags; 169 CARD32 flags;
168 CARD32 functions; 170 CARD32 functions;
… …
170 INT32 input_mode; 172 INT32 input_mode;
171 CARD32 status; 173 CARD32 status;
172} MWMHints; 174} MWMHints;
173#endif 175#endif
174 176
177#if ENABLE_XEMBED
178// XEMBED messages
179# define XEMBED_EMBEDDED_NOTIFY 0
180# define XEMBED_WINDOW_ACTIVATE 1
181# define XEMBED_WINDOW_DEACTIVATE 2
182# define XEMBED_REQUEST_FOCUS 3
183# define XEMBED_FOCUS_IN 4
184# define XEMBED_FOCUS_OUT 5
185# define XEMBED_FOCUS_NEXT 6
186# define XEMBED_FOCUS_PREV 7
187
188# define XEMBED_MODALITY_ON 10
189# define XEMBED_MODALITY_OFF 11
190# define XEMBED_REGISTER_ACCELERATOR 12
191# define XEMBED_UNREGISTER_ACCELERATOR 13
192# define XEMBED_ACTIVATE_ACCELERATOR 14
193
194// XEMBED detail code
195# define XEMBED_FOCUS_CURRENT 0
196# define XEMBED_FOCUS_FIRST 1
197# define XEMBED_FOCUS_LAST 2
198
199# define XEMBED_MAPPED (1 << 0)
200#endif
201
175/* 202/*
176 ***************************************************************************** 203 *****************************************************************************
177 * NORMAL DEFINES 204 * NORMAL DEFINES
178 ***************************************************************************** 205 *****************************************************************************
179 */ 206 */
… …
229 256
230#define R_SB_ALIGN_CENTRE 0 257#define R_SB_ALIGN_CENTRE 0
231#define R_SB_ALIGN_TOP 1 258#define R_SB_ALIGN_TOP 1
232#define R_SB_ALIGN_BOTTOM 2 259#define R_SB_ALIGN_BOTTOM 2
233 260
234#define R_SB_RXVT 0
235#define R_SB_NEXT 1 261#define R_SB_NEXT 1
236#define R_SB_XTERM 2 262#define R_SB_XTERM 2
237#define R_SB_PLAIN 4 263#define R_SB_PLAIN 4
264#define R_SB_RXVT 8
238 265
239#define SB_WIDTH_NEXT 19 266#define SB_WIDTH_NEXT 19
240#define SB_WIDTH_XTERM 15 267#define SB_WIDTH_XTERM 15
241#define SB_WIDTH_PLAIN 7 268#define SB_WIDTH_PLAIN 7
242#ifndef SB_WIDTH_RXVT 269#ifndef SB_WIDTH_RXVT
… …
324#define FONT_DN "#-" 351#define FONT_DN "#-"
325#define FONT_UP "#+" 352#define FONT_UP "#+"
326 353
327/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
328enum { 355enum {
329 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
330 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
331 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
332}; 359};
333 360
334/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
335enum { 362enum {
336 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
… …
349enum { 376enum {
350 PRIMARY = 0, 377 PRIMARY = 0,
351 SECONDARY, 378 SECONDARY,
352}; 379};
353 380
354#define RS_None 0 /* Normal */ 381#define RS_None 0
355 382
356#define RS_fgMask 0x0000007fUL /* 128 colors */ 383#define RS_fgMask 0x0000007fUL // 128 colors
357#define RS_bgMask 0x00003f80UL /* 128 colors */ 384#define RS_bgMask 0x00003f80UL // 128 colors
358 385
359// font styles 386// font styles
360#define RS_Bold 0x00004000UL // value 1 387#define RS_Bold 0x00004000UL // value 1
361#define RS_Italic 0x00008000UL // value 2 388#define RS_Italic 0x00008000UL // value 2
362 389
363// fake styles 390// fake styles
364#define RS_Blink 0x00010000UL /* blink */ 391#define RS_Blink 0x00010000UL // blink
365#define RS_RVid 0x00020000UL /* reverse video */ 392#define RS_RVid 0x00020000UL // reverse video
366#define RS_Uline 0x00040000UL /* underline */ 393#define RS_Uline 0x00040000UL // underline
367 394
368// 5 bits still to go 395// 5 custom bits for extensions
396#define RS_customCount 32
397#define RS_customMask 0x00f80000UL
398#define RS_customShift 19
369 399
370// other flags 400// other flags
371#define RS_Careful 0x80000000UL /* be careful when drawing these */ 401#define RS_Careful 0x80000000UL /* be careful when drawing these */
372 402
373#define RS_styleCount 4 403#define RS_styleCount 4
… …
435 XTerm_Color_UL = 19, // change actual 'Underline' color 465 XTerm_Color_UL = 19, // change actual 'Underline' color
436 XTerm_Pixmap = 20, // new bg pixmap 466 XTerm_Pixmap = 20, // new bg pixmap
437 XTerm_restoreFG = 39, // change default fg color 467 XTerm_restoreFG = 39, // change default fg color
438 XTerm_restoreBG = 49, // change default bg color 468 XTerm_restoreBG = 49, // change default bg color
439 XTerm_dumpscreen = 55, // dump scrollback and all of screen 469 XTerm_dumpscreen = 55, // dump scrollback and all of screen
470
440 XTerm_locale = 701, // change locale 471 URxvt_locale = 701, // change locale
441 XTerm_Menu = 703, // set menu item 472 URxvt_Menu = 703, // set menu item
442 XTerm_Color_IT = 704, // change actual 'Italic' colour 473 URxvt_Color_IT = 704, // change actual 'Italic' colour
443 XTerm_Color_tint = 705, // change actual tint colour 474 URxvt_Color_tint = 705, // change actual tint colour
444 475
445 URxvt_font = 710, 476 URxvt_font = 710,
446 URxvt_boldFont = 711, 477 URxvt_boldFont = 711,
447 URxvt_italicFont = 712, 478 URxvt_italicFont = 712,
448 URxvt_boldItalicFont = 713, 479 URxvt_boldItalicFont = 713,
480
481 URxvt_view_up = 720,
482 URxvt_view_down = 721,
449}; 483};
450 484
451/* Words starting with `Color_' are colours. Others are counts */ 485/* Words starting with `Color_' are colours. Others are counts */
452/* 486/*
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 487 * The PixColor and rendition colour usage should probably be decoupled
456 * on the unnecessary items, e.g. Color_pointer, but won't bother 488 * 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 489 * until we need to. Also, be aware of usage in pixcolor_set
458 */ 490 */
459 491
460enum colour_list { 492enum colour_list {
… …
497 Color_BD, 529 Color_BD,
498 Color_IT, 530 Color_IT,
499 Color_UL, 531 Color_UL,
500 Color_RV, 532 Color_RV,
501#endif 533#endif
534#if ENABLE_FRILLS
535 Color_underline,
536#endif
502#ifdef OPTION_HC 537#ifdef OPTION_HC
503 Color_HC, 538 Color_HC,
504#endif 539#endif
505#ifdef KEEP_SCROLLCOLOR 540#ifdef KEEP_SCROLLCOLOR
506 Color_scroll, 541 Color_scroll,
507 Color_trough, 542 Color_trough,
508#endif 543#endif
509#if TINTING 544#if TINTING
510 Color_tint, 545 Color_tint,
546#endif
547#if OFF_FOCUS_FADING
548 Color_fade,
511#endif 549#endif
512 NRS_COLORS, /* */ 550 NRS_COLORS, /* */
513#ifdef KEEP_SCROLLCOLOR 551#ifdef KEEP_SCROLLCOLOR
514 Color_topShadow = NRS_COLORS, 552 Color_topShadow = NRS_COLORS,
515 Color_bottomShadow, 553 Color_bottomShadow,
… …
538 Rs_font, 576 Rs_font,
539#if ENABLE_STYLES 577#if ENABLE_STYLES
540 Rs_boldFont, 578 Rs_boldFont,
541 Rs_italicFont, 579 Rs_italicFont,
542 Rs_boldItalicFont, 580 Rs_boldItalicFont,
581 Rs_intensityStyles,
543#endif 582#endif
544 Rs_name, 583 Rs_name,
545 Rs_title, 584 Rs_title,
546#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 585#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
547 Rs_path, 586 Rs_path,
… …
557#ifdef HAVE_SCROLLBARS 596#ifdef HAVE_SCROLLBARS
558 Rs_scrollBar, 597 Rs_scrollBar,
559 Rs_scrollBar_right, 598 Rs_scrollBar_right,
560 Rs_scrollBar_floating, 599 Rs_scrollBar_floating,
561 Rs_scrollBar_align, 600 Rs_scrollBar_align,
562#endif
563 Rs_scrollstyle, /* Rs_scrollBar_style */ 601 Rs_scrollstyle, /* Rs_scrollBar_style */
602 Rs_scrollBar_thickness,
603#endif
564 Rs_scrollTtyOutput, 604 Rs_scrollTtyOutput,
565 Rs_scrollTtyKeypress, 605 Rs_scrollTtyKeypress,
566 Rs_scrollWithBuffer, 606 Rs_scrollWithBuffer,
567 Rs_saveLines, 607 Rs_saveLines,
568 Rs_utmpInhibit, 608 Rs_utmpInhibit,
… …
593#ifdef TRANSPARENT 633#ifdef TRANSPARENT
594 Rs_transparent, 634 Rs_transparent,
595 Rs_transparent_all, 635 Rs_transparent_all,
596#endif 636#endif
597#if ENABLE_FRILLS 637#if ENABLE_FRILLS
638 Rs_pty_fd,
639 Rs_hold,
598 Rs_ext_bwidth, 640 Rs_ext_bwidth,
599 Rs_int_bwidth, 641 Rs_int_bwidth,
600 Rs_borderLess, 642 Rs_borderLess,
601#endif
602 Rs_scrollBar_thickness,
603#ifndef NO_LINESPACE
604 Rs_lineSpace, 643 Rs_lineSpace,
644 Rs_cursorUnderline,
645#endif
646#if CURSOR_BLINK
647 Rs_cursorBlink,
648#endif
649#if ENABLE_XEMBED
650 Rs_embed,
605#endif 651#endif
606 Rs_cutchars, 652 Rs_cutchars,
607 Rs_modifier, 653 Rs_modifier,
608 Rs_answerbackstring, 654 Rs_answerbackstring,
609 Rs_tripleclickwords, 655 Rs_tripleclickwords,
610 Rs_insecure, 656 Rs_insecure,
611 Rs_cursorBlink,
612 Rs_pointerBlank, 657 Rs_pointerBlank,
613 Rs_pointerBlankDelay, 658 Rs_pointerBlankDelay,
614 Rs_imLocale, 659 Rs_imLocale,
660 Rs_imFont,
615 Rs_pastableTabs, 661 Rs_pastableTabs,
616#ifndef NO_SECONDARY_SCREEN 662#ifndef NO_SECONDARY_SCREEN
617 Rs_secondaryScreen, 663 Rs_secondaryScreen,
618 Rs_secondaryScroll, 664 Rs_secondaryScroll,
619#endif 665#endif
… …
634 XA_MULTIPLE, 680 XA_MULTIPLE,
635 XA_TARGETS, 681 XA_TARGETS,
636 XA_TIMESTAMP, 682 XA_TIMESTAMP,
637 XA_VT_SELECTION, 683 XA_VT_SELECTION,
638 XA_INCR, 684 XA_INCR,
685 XA_WM_PROTOCOLS,
639 XA_WMDELETEWINDOW, 686 XA_WM_DELETE_WINDOW,
687 XA_CLIPBOARD,
688#if ENABLE_FRILLS
689 XA_MOTIF_WM_HINTS,
690#endif
691#if ENABLE_EWMH
692 XA_NET_WM_PID,
693 XA_NET_WM_NAME,
694 XA_NET_WM_ICON_NAME,
695 XA_NET_WM_PING,
696#endif
697#if USE_XIM
698 XA_WM_LOCALE_NAME,
699#endif
640#ifdef TRANSPARENT 700#if TRANSPARENT
641 XA_XROOTPMAPID, 701 XA_XROOTPMAP_ID,
642 XA_XSETROOTID, 702 XA_ESETROOT_PMAP_ID,
643#endif 703#endif
644#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 704#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
645 XA_DNDPROTOCOL, 705 XA_DNDPROTOCOL,
646 XA_DNDSELECTION, 706 XA_DNDSELECTION,
647#endif /* OFFIX_DND */ 707#endif
648 XA_CLIPBOARD, 708#if ENABLE_XEMBED
709 XA_XEMBED,
710 XA_XEMBED_INFO,
711#endif
649 NUM_XA 712 NUM_XA
650}; 713};
651 714
652/* DEC private modes */ 715/* DEC private modes */
653#define PrivMode_132 (1UL<<0) 716#define PrivMode_132 (1UL<<0)
… …
680 priv_modes |= (bit); \ 743 priv_modes |= (bit); \
681 else \ 744 else \
682 priv_modes &= ~(bit) 745 priv_modes &= ~(bit)
683 746
684#ifdef ALLOW_132_MODE 747#ifdef ALLOW_132_MODE
685# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 748# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
686#else 749#else
687# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 750# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
688#endif 751#endif
689 752
690// do not change these constants lightly, there are many interdependencies 753// do not change these constants lightly, there are many interdependencies
691#define IMBUFSIZ 128 // input modifier buffer sizes 754#define IMBUFSIZ 128 // input modifier buffer sizes
692#define KBUFSZ 512 // size of keyboard mapping buffer 755#define KBUFSZ 512 // size of keyboard mapping buffer
… …
743#define strdup(x) strdup((const char *)(x)) 806#define strdup(x) strdup((const char *)(x))
744#define strlen(x) strlen((const char *)(x)) 807#define strlen(x) strlen((const char *)(x))
745#define strchr(x, y) strchr((const char *)(x), (int)(y)) 808#define strchr(x, y) strchr((const char *)(x), (int)(y))
746#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 809#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
747 810
811#define dDisp Display *disp = display->display
812
748/* convert pixel dimensions to row/column values. Everything as int32_t */ 813/* convert pixel dimensions to row/column values. Everything as int32_t */
749#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 814#define Pixel2Col(x) Pixel2Width((int32_t)(x))
750#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 815#define Pixel2Row(y) Pixel2Height((int32_t)(y))
751#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 816#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
752#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 817#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
753#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 818#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
754#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 819#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
755#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 820#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
756#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 821#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
757 822
758#define TermWin_TotalWidth() ((int32_t)TermWin.width) 823#define TermWin_TotalWidth() ((int32_t)this->width)
759#define TermWin_TotalHeight() ((int32_t)TermWin.height) 824#define TermWin_TotalHeight() ((int32_t)this->height)
825
826// for m >= -n, ensure remainder lies between 0..n-1
827#define MOD(m,n) (((m) + (n)) % (n))
828
829#define LINENO(n) MOD (term_start + int(n), total_rows)
830#define ROW(n) row_buf [LINENO (n)]
760 831
761/* how to build & extract colors and attributes */ 832/* how to build & extract colors and attributes */
762#define GET_BASEFG(x) (((x) & RS_fgMask)) 833#define GET_BASEFG(x) (((x) & RS_fgMask))
763#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 834#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
764#ifndef NO_BRIGHTCOLOR
765# define GET_FGCOLOR(x) \
766 ((((x) & RS_Bold) == 0 \
767 || GET_BASEFG (x) < minCOLOR \
768 || GET_BASEFG (x) >= minBrightCOLOR) \
769 ? GET_BASEFG (x) \
770 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
771# define GET_BGCOLOR(x) \
772 ((((x) & RS_Blink) == 0 \
773 || GET_BASEBG (x) < minCOLOR \
774 || GET_BASEBG (x) >= minBrightCOLOR) \
775 ? GET_BASEBG (x) \
776 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
777#else
778# define GET_FGCOLOR(x) GET_BASEFG(x)
779# define GET_BGCOLOR(x) GET_BASEBG(x)
780#endif
781 835
782#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 836#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
783#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 837#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
784 838
785#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 839#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
798 852
799#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 853#define SET_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))) 854#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
801 855
802#if ENABLE_STYLES 856#if ENABLE_STYLES
803# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 857# define FONTSET(style) fontset[GET_STYLE (style)]
804#else 858#else
805# define FONTSET(style) TermWin.fontset[0] 859# define FONTSET(style) fontset[0]
806#endif 860#endif
807 861
808#ifdef HAVE_SCROLLBARS 862#ifdef HAVE_SCROLLBARS
809# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 863# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
810#else 864#else
… …
835#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 889#define scrollbar_size() (scrollBar.end - scrollBar.beg \
836 - scrollbar_minheight ()) 890 - scrollbar_minheight ())
837 891
838#if (MENUBAR_MAX > 1) 892#if (MENUBAR_MAX > 1)
839/* rendition style flags */ 893/* rendition style flags */
840# define menuBar_height() (TermWin.fheight + SHADOW) 894# define menuBar_height() (fheight + SHADOW)
841# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 895# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
842# define isMenuBarWindow(w) ((w) == menuBar.win) 896# define isMenuBarWindow(w) ((w) == menuBar.win)
843#else 897#else
844# define menuBar_height() (0) 898# define menuBar_height() (0)
845# define menuBar_TotalHeight() (0) 899# define menuBar_TotalHeight() (0)
… …
849#ifdef XPM_BACKGROUND 903#ifdef XPM_BACKGROUND
850# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 904# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
851#else 905#else
852# define XPMClearArea(a, b, c, d, e, f, g) 906# define XPMClearArea(a, b, c, d, e, f, g)
853#endif 907#endif
854
855#ifndef STRICT_FONT_CHECKING
856# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
857#endif
858
859#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
860#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
861 908
862#ifdef UTMP_SUPPORT 909#ifdef UTMP_SUPPORT
863# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 910# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
864# undef HAVE_UTMPX_H 911# undef HAVE_UTMPX_H
865# undef HAVE_STRUCT_UTMPX 912# undef HAVE_STRUCT_UTMPX
… …
899#endif 946#endif
900 947
901extern class rxvt_failure_exception { } rxvt_failure_exception; 948extern class rxvt_failure_exception { } rxvt_failure_exception;
902 949
903typedef callback1<void, const char *> log_callback; 950typedef callback1<void, const char *> log_callback;
951typedef callback1<int, int> getfd_callback;
904 952
905extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 953extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
906extern void rxvt_log (const char *fmt, ...); 954extern void rxvt_log (const char *fmt, ...);
907extern void rxvt_warn (const char *fmt, ...); 955extern void rxvt_warn (const char *fmt, ...);
908extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 956extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
938 986
939 operator mbstate_t *() { return &mbs; } 987 operator mbstate_t *() { return &mbs; }
940 void reset () { memset (&mbs, 0, sizeof (mbs)); } 988 void reset () { memset (&mbs, 0, sizeof (mbs)); }
941 mbstate () { reset (); } 989 mbstate () { reset (); }
942}; 990};
991
992#define UNICODE_MASK 0x1fffffUL
943 993
944#if UNICODE3 994#if UNICODE3
945# define COMPOSE_LO 0x40000000UL 995# define COMPOSE_LO 0x40000000UL
946# define COMPOSE_HI 0x400fffffUL 996# define COMPOSE_HI 0x400fffffUL
947# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 997# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
977 1027
978extern class rxvt_composite_vec rxvt_composite; 1028extern class rxvt_composite_vec rxvt_composite;
979#endif 1029#endif
980 1030
981 1031
1032#ifdef KEYSYM_RESOURCE
1033 class keyboard_manager;
1034#endif
1035
982struct rxvt_term : zero_initialized, rxvt_vars { 1036struct rxvt_term : zero_initialized, rxvt_vars {
983 log_callback *log_hook; // log error messages through this hook, if != 0 1037 log_callback *log_hook; // log error messages through this hook, if != 0
1038 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
984 1039
985 struct mbstate mbstate; // current input multibyte state 1040 struct mbstate mbstate; // current input multibyte state
986 1041
987 unsigned char want_refresh:1, 1042 unsigned char want_refresh:1,
988#ifdef TRANSPARENT 1043#ifdef TRANSPARENT
… …
1003 hidden_text:1, 1058 hidden_text:1,
1004#endif 1059#endif
1005#ifdef POINTER_BLANK 1060#ifdef POINTER_BLANK
1006 hidden_pointer:1, 1061 hidden_pointer:1,
1007#endif 1062#endif
1008// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1063 enc_utf8:1, /* wether locale uses utf-8 */
1009 seen_input:1, /* wether we have seen some program output yet */ 1064 seen_input:1, /* wether we have seen some program output yet */
1010 seen_resize:1, /* wether we had a resize event */ 1065 seen_resize:1, /* wether we had a resize event */
1011 parsed_geometry:1; 1066 parsed_geometry:1;
1012 1067
1013 unsigned char refresh_type, 1068 unsigned char refresh_type,
… …
1059# ifdef POINTER_BLANK 1114# ifdef POINTER_BLANK
1060 pointerBlankDelay, 1115 pointerBlankDelay,
1061# endif 1116# endif
1062 allowedxerror; 1117 allowedxerror;
1063/* ---------- */ 1118/* ---------- */
1064 unsigned int ModMetaMask, 1119 unsigned int ModLevel3Mask,
1120 ModMetaMask,
1065 ModNumLockMask; 1121 ModNumLockMask;
1066 int old_width, /* last used width in screen resize */ 1122 int old_width, /* last used width in screen resize */
1067 old_height; /* last used height in screen resize */ 1123 old_height; /* last used height in screen resize */
1068 unsigned long priv_modes, 1124 unsigned long priv_modes,
1069 SavedModes; 1125 SavedModes;
… …
1099#endif 1155#endif
1100/* ---------- */ 1156/* ---------- */
1101 Time selection_time, 1157 Time selection_time,
1102 selection_request_time; 1158 selection_request_time;
1103 pid_t cmd_pid; /* process id of child */ 1159 pid_t cmd_pid; /* process id of child */
1160 char * incr_buf;
1161 size_t incr_buf_size, incr_buf_fill;
1104/* ---------- */ 1162/* ---------- */
1105 Cursor leftptr_cursor; 1163 Cursor leftptr_cursor;
1106#ifdef POINTER_BLANK
1107 Cursor blank_cursor;
1108#endif
1109/* ---------- */ 1164/* ---------- */
1110#ifndef NO_BACKSPACE_KEY 1165#ifndef NO_BACKSPACE_KEY
1111 const char *key_backspace; 1166 const char *key_backspace;
1112#endif 1167#endif
1113#ifndef NO_DELETE_KEY 1168#ifndef NO_DELETE_KEY
… …
1158 void scr_overlay_off (); 1213 void scr_overlay_off ();
1159 void scr_overlay_set (int x, int y, 1214 void scr_overlay_set (int x, int y,
1160 text_t text, 1215 text_t text,
1161 rend_t rend = OVERLAY_RSTYLE); 1216 rend_t rend = OVERLAY_RSTYLE);
1162 void scr_overlay_set (int x, int y, const char *s); 1217 void scr_overlay_set (int x, int y, const char *s);
1218 void scr_overlay_set (int x, int y, const wchar_t *s);
1163#endif 1219#endif
1164 1220
1165 vector<void *> allocated; // free these memory blocks with free() 1221 vector<void *> allocated; // free these memory blocks with free()
1166 1222
1167 char *env_windowid; /* environmental variable WINDOWID */ 1223 char *env_windowid; /* environmental variable WINDOWID */
1168 char *env_display; /* environmental variable DISPLAY */ 1224 char *env_display; /* environmental variable DISPLAY */
1169 char *env_term; /* environmental variable TERM */ 1225 char *env_term; /* environmental variable TERM */
1170 char *env_colorfgbg; 1226 char *env_colorfgbg;
1171 char *locale; 1227 char *locale;
1172#if 0
1173 char *codeset;
1174#endif
1175 char charsets[4]; 1228 char charsets[4];
1176 unsigned char *v_buffer; /* pointer to physical buffer */ 1229 unsigned char *v_buffer; /* pointer to physical buffer */
1177 unsigned int v_buflen; /* size of area to write */ 1230 unsigned int v_buflen; /* size of area to write */
1178 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1231 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1232
1179#ifdef KEYSYM_RESOURCE 1233#ifdef KEYSYM_RESOURCE
1180 const unsigned char *Keysym_map[256]; 1234 keyboard_manager *keyboard;
1181#endif 1235#endif
1236
1182 const char *rs[NUM_RESOURCES]; 1237 const char *rs[NUM_RESOURCES];
1183 /* command input buffering */ 1238 /* command input buffering */
1184 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1239 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1185 unsigned char cmdbuf_base[CBUFSIZ]; 1240 unsigned char cmdbuf_base[CBUFSIZ];
1186 1241
… …
1193 // ISO 14755 entry support 1248 // ISO 14755 entry support
1194 unicode_t iso14755buf; 1249 unicode_t iso14755buf;
1195 void commit_iso14755 (); 1250 void commit_iso14755 ();
1196 int hex_keyval (XKeyEvent &ev); 1251 int hex_keyval (XKeyEvent &ev);
1197# if ISO_14755 1252# if ISO_14755
1198 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1253 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1199 void iso14755_54 (int x, int y); 1254 void iso14755_54 (int x, int y);
1200# endif 1255# endif
1201#endif 1256#endif
1202 1257
1258 // modifies first argument(!)
1203 void paste (const unsigned char *data, unsigned int len); 1259 void paste (unsigned char *data, unsigned int len);
1204 1260
1205 void flush (); 1261 void flush ();
1206 1262
1207#if TRANSPARENT 1263#if TRANSPARENT
1208 void rootwin_cb (XEvent &xev); 1264 void rootwin_cb (XEvent &xev);
1209 xevent_watcher rootwin_ev; 1265 xevent_watcher rootwin_ev;
1210#endif 1266#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;
1215 1267
1216 void x_cb (XEvent &xev); 1268 void x_cb (XEvent &xev);
1217 xevent_watcher termwin_ev; 1269 xevent_watcher termwin_ev;
1218 xevent_watcher vt_ev; 1270 xevent_watcher vt_ev;
1219#ifdef HAVE_SCROLLBARS 1271#ifdef HAVE_SCROLLBARS
… …
1254#endif 1306#endif
1255 void pointer_unblank (); 1307 void pointer_unblank ();
1256 1308
1257 void tt_printf (const char *fmt,...); 1309 void tt_printf (const char *fmt,...);
1258 void tt_write (const unsigned char *data, unsigned int len); 1310 void tt_write (const unsigned char *data, unsigned int len);
1311 void pty_write ();
1259 1312
1260 void tt_winch (); 1313 void tt_winch ();
1261 1314
1262 rxvt_term (); 1315 rxvt_term ();
1263 ~rxvt_term (); 1316 ~rxvt_term ();
1317 void child_exit (); // child has exited, usually destroys
1264 void destroy (); 1318 void destroy ();
1319 void emergency_cleanup ();
1265 1320
1266 bool init (int argc, const char *const *argv); 1321 bool init (int argc, const char *const *argv);
1267 bool init_vars (); 1322 bool init_vars ();
1268 1323
1269 bool pty_fill (); 1324 bool pty_fill ();
… …
1278 int run_child (const char *const *argv); 1333 int run_child (const char *const *argv);
1279 1334
1280 void color_aliases (int idx); 1335 void color_aliases (int idx);
1281 void recolour_cursor (); 1336 void recolour_cursor ();
1282 void create_windows (int argc, const char *const *argv); 1337 void create_windows (int argc, const char *const *argv);
1283 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1338 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1284 void window_calc (unsigned int width, unsigned int height); 1339 void window_calc (unsigned int newwidth, unsigned int newheight);
1285 1340
1286#if USE_XIM 1341#if USE_XIM
1287 rxvt_xim *input_method; 1342 rxvt_xim *input_method;
1288 XIC Input_Context; 1343 XIC Input_Context;
1289 XIMStyle input_style; 1344 XIMStyle input_style;
… …
1323 1378
1324 bool cmd_parse (); 1379 bool cmd_parse ();
1325 void mouse_report (XButtonEvent &ev); 1380 void mouse_report (XButtonEvent &ev);
1326 void button_press (XButtonEvent &ev); 1381 void button_press (XButtonEvent &ev);
1327 void button_release (XButtonEvent &ev); 1382 void button_release (XButtonEvent &ev);
1383 void focus_in ();
1384 void focus_out ();
1328 int check_our_parents (); 1385 int check_our_parents ();
1329#ifdef PRINTPIPE 1386#ifdef PRINTPIPE
1330 FILE *popen_printer (); 1387 FILE *popen_printer ();
1331 int pclose_printer (FILE *stream); 1388 int pclose_printer (FILE *stream);
1332#endif 1389#endif
… …
1352 void makeutent (const char *pty, const char *hostname); 1409 void makeutent (const char *pty, const char *hostname);
1353 void cleanutent (); 1410 void cleanutent ();
1354 // main.C 1411 // main.C
1355 void privileged_utmp (rxvt_privaction action); 1412 void privileged_utmp (rxvt_privaction action);
1356 bool set_fonts (); 1413 bool set_fonts ();
1414 void set_string_property (Atom prop, const char *str, int len = -1);
1415 void set_utf8_property (Atom prop, const char *str, int len = -1);
1357 void set_title (const char *str); 1416 void set_title (const char *str);
1358 void set_icon_name (const char *str); 1417 void set_icon_name (const char *str);
1359 void set_window_color (int idx, const char *color); 1418 void set_window_color (int idx, const char *color);
1360 void set_colorfgbg (); 1419 void set_colorfgbg ();
1361 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1420 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1362 void set_widthheight (unsigned int width, unsigned int height); 1421 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1363 1422
1364#ifdef MENUBAR 1423#ifdef MENUBAR
1365 // menubar.C 1424 // menubar.C
1366 void menuitem_free (menu_t *menu, menuitem_t *item); 1425 void menuitem_free (menu_t *menu, menuitem_t *item);
1367 int action_dispatch (action_t *action); 1426 int action_dispatch (action_t *action);
… …
1393 void menubar_control (XButtonEvent &ev); 1452 void menubar_control (XButtonEvent &ev);
1394 void map_menuBar (int map); 1453 void map_menuBar (int map);
1395#endif 1454#endif
1396 1455
1397 // screen.C 1456 // screen.C
1398 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1457
1399 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1458 void lalloc (line_t &l)
1459 {
1460 l.t = (text_t *)talloc->alloc ();
1461 l.r = (rend_t *)ralloc->alloc ();
1462 }
1463
1464#if 0
1465 void lfree (line_t &l)
1466 {
1467 talloc->free (l.t);
1468 ralloc->free (l.r);
1469 }
1470#endif
1471
1472 void lresize (line_t &l)
1473 {
1474 if (!l.t)
1475 return;
1476
1477 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1478 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1479
1480 l.l = min (l.l, ncol);
1481
1482 if (ncol > prev_ncol)
1483 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1484 }
1485
1486 int fgcolor_of (rend_t r)
1487 {
1488 int base = GET_BASEFG (r);
1489#ifndef NO_BRIGHTCOLOR
1490 if (r & RS_Bold
1491# if ENABLE_STYLES
1492 && OPTION (Opt_intensityStyles)
1493# endif
1494 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1495 base += minBrightCOLOR - minCOLOR;
1496#endif
1497 return base;
1498 }
1499
1500 int bgcolor_of (rend_t r)
1501 {
1502 int base = GET_BASEBG (r);
1503#ifndef NO_BRIGHTCOLOR
1504 if (r & RS_Blink
1505# if ENABLE_STYLES
1506 && OPTION (Opt_intensityStyles)
1507# endif
1508 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1509 base += minBrightCOLOR - minCOLOR;
1510#endif
1511 return base;
1512 }
1513
1514 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1515 void scr_blank_screen_mem (line_t &l, rend_t efs);
1400 int scr_scroll_text (int row1, int row2, int count, int spec); 1516 int scr_scroll_text (int row1, int row2, int count);
1401 void scr_reset (); 1517 void scr_reset ();
1402 void scr_reset_realloc ();
1403 void scr_release (); 1518 void scr_release ();
1404 void scr_clear (bool really = false); 1519 void scr_clear (bool really = false);
1405 void scr_refresh (unsigned char refresh_type); 1520 void scr_refresh (unsigned char refresh_type);
1406 bool scr_refresh_rend (rend_t mask, rend_t value); 1521 bool scr_refresh_rend (rend_t mask, rend_t value);
1407 void scr_erase_screen (int mode); 1522 void scr_erase_screen (int mode);
1523#if ENABLE_FRILLS
1524 void scr_erase_savelines ();
1525 void scr_backindex ();
1526 void scr_forwardindex ();
1527#endif
1408 void scr_touch (bool refresh); 1528 void scr_touch (bool refresh);
1409 void scr_expose (int x, int y, int width, int height, bool refresh); 1529 void scr_expose (int x, int y, int width, int height, bool refresh);
1410 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1530 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1411 void scr_recolour (); 1531 void scr_recolour ();
1412 void scr_remap_chars (); 1532 void scr_remap_chars ();
1413 void scr_remap_chars (text_t *tp, rend_t *rp); 1533 void scr_remap_chars (const line_t &l);
1414 1534
1415 void scr_poweron (); 1535 void scr_poweron ();
1416 void scr_cursor (int mode); 1536 void scr_cursor (int mode);
1417 void scr_do_wrap (); 1537 void scr_do_wrap ();
1418 int scr_change_screen (int scrn); 1538 int scr_change_screen (int scrn);
1419 void scr_color (unsigned int color, int fgbg); 1539 void scr_color (unsigned int color, int fgbg);
1420 void scr_rendition (int set, int style); 1540 void scr_rendition (int set, int style);
1421 void scr_add_lines (const unicode_t *str, int nlines, int len); 1541 void scr_add_lines (const unicode_t *str, int nlines, int len);
1422 void scr_backspace (); 1542 void scr_backspace ();
1423 void scr_tab (int count, bool ht = false); 1543 void scr_tab (int count, bool ht = false);
1424 void scr_backindex ();
1425 void scr_forwardindex ();
1426 void scr_gotorc (int row, int col, int relative); 1544 void scr_gotorc (int row, int col, int relative);
1427 void scr_index (enum page_dirn direction); 1545 void scr_index (enum page_dirn direction);
1428 void scr_erase_line (int mode); 1546 void scr_erase_line (int mode);
1429 void scr_E (); 1547 void scr_E ();
1430 void scr_insdel_lines (int count, int insdel); 1548 void scr_insdel_lines (int count, int insdel);
… …
1446 void scr_bell (); 1564 void scr_bell ();
1447 void scr_printscreen (int fullhist); 1565 void scr_printscreen (int fullhist);
1448 void scr_reverse_selection (); 1566 void scr_reverse_selection ();
1449 void scr_dump (int fd); 1567 void scr_dump (int fd);
1450 void selection_check (int check_more); 1568 void selection_check (int check_more);
1451 int selection_paste (Window win, Atom prop, bool delete_prop); 1569 void selection_paste (Window win, Atom prop, bool delete_prop);
1452 void selection_property (Window win, Atom prop); 1570 void selection_property (Window win, Atom prop);
1453 void selection_request (Time tm, int x, int y); 1571 void selection_request (Time tm, int x, int y);
1454 int selection_request_other (Atom target, int selnum); 1572 int selection_request_other (Atom target, int selnum);
1455 void selection_clear (); 1573 void selection_clear ();
1456 void selection_make (Time tm); 1574 void selection_make (Time tm);
… …
1491 1609
1492 // xdefaults.C 1610 // xdefaults.C
1493 void get_options (int argc, const char *const *argv); 1611 void get_options (int argc, const char *const *argv);
1494 int parse_keysym (const char *str, const char *arg); 1612 int parse_keysym (const char *str, const char *arg);
1495 void get_xdefaults (FILE *stream, const char *name); 1613 void get_xdefaults (FILE *stream, const char *name);
1496 void extract_resources (Display *display, const char *name); 1614 void extract_resources ();
1497 // xpm.C 1615 // xpm.C
1498 int scale_pixmap (const char *geom); 1616 int scale_pixmap (const char *geom);
1499 void resize_pixmap (); 1617 void resize_pixmap ();
1500 Pixmap set_bgPixmap (const char *file); 1618 Pixmap set_bgPixmap (const char *file);
1501}; 1619};

Diff Legend

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