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.134 by root, Wed Dec 15 02:30:47 2004 UTC vs.
Revision 1.180 by root, Mon Jan 2 15:35:43 2006 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
28#endif
23 29
24/* 30/*
25 ***************************************************************************** 31 *****************************************************************************
26 * SYSTEM HACKS 32 * SYSTEM HACKS
27 ***************************************************************************** 33 *****************************************************************************
… …
66# define STDIN_FILENO 0 72# define STDIN_FILENO 0
67# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
68# define STDERR_FILENO 2 74# define STDERR_FILENO 2
69#endif 75#endif
70 76
71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
73# define NO_SETOWNER_TTYDEV 1
74# endif
75#endif
76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
77# define NO_SETOWNER_TTYDEV 1
78#endif
79
80/* 77/*
81 ***************************************************************************** 78 *****************************************************************************
82 * PROTOTYPES 79 * PROTOTYPES
83 ***************************************************************************** 80 *****************************************************************************
84 */ 81 */
82// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 83RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 84RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 85void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 86void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 87void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 88void * rxvt_realloc (void *ptr, size_t size);
89void rxvt_privileges (rxvt_privaction action);
90
91// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len = -1); 92char * rxvt_wcstombs (const wchar_t *str, int len = -1);
92wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 93wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
93char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 94char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
94wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 95wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
95char * rxvt_strdup (const char *str); 96char * rxvt_strdup (const char *str);
97
98// misc.C
96char * rxvt_r_basename (const char *str); 99char * rxvt_r_basename (const char *str);
97void rxvt_vlog (const char *fmt, va_list arg_ptr); 100void rxvt_vlog (const char *fmt, va_list arg_ptr);
98void rxvt_log (const char *fmt,...); 101void rxvt_log (const char *fmt,...);
99void rxvt_warn (const char *fmt,...); 102void rxvt_warn (const char *fmt,...);
100void rxvt_fatal (const char *fmt,...); 103void rxvt_fatal (const char *fmt,...);
… …
106char ** rxvt_splitcommastring (const char *cs); 109char ** rxvt_splitcommastring (const char *cs);
107void rxvt_freecommastring (char **cs); 110void rxvt_freecommastring (char **cs);
108char * rxvt_File_find (const char *file, const char *ext, const char *path); 111char * rxvt_File_find (const char *file, const char *ext, const char *path);
109void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
110void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
111 114void rxvt_usleep (int usecs);
112void rxvt_privileges (rxvt_privaction action);
113 115
114/* 116/*
115 ***************************************************************************** 117 *****************************************************************************
116 * STRUCTURES AND TYPEDEFS 118 * STRUCTURES AND TYPEDEFS
117 ***************************************************************************** 119 *****************************************************************************
… …
127#endif 129#endif
128 130
129/* If we're using either the rxvt scrollbar or menu bars, keep the 131/* If we're using either the rxvt scrollbar or menu bars, keep the
130 * scrollColor resource. 132 * scrollColor resource.
131 */ 133 */
132#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 134#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
133# define KEEP_SCROLLCOLOR 1 135# define KEEP_SCROLLCOLOR 1
134#else 136#else
135# undef KEEP_SCROLLCOLOR 137# undef KEEP_SCROLLCOLOR
136#endif 138#endif
137 139
… …
151 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
152 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
153 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
154}; 156};
155 157
156#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
157#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
158#define SWAP_IT(one, two, typeof) \
159 do { \
160 typeof swapittmp; \
161 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
162 } while (/* CONSTCOND */ 0)
163#define BOUND_POSITIVE_INT16(val) \
164 (int16_t) ((val) <= 0 \
165 ? 0 \
166 : min ((val), (((uint16_t)-1)>>1)))
167
168#if ENABLE_FRILLS 158#if ENABLE_FRILLS
169typedef struct _mwmhints { 159typedef struct _mwmhints {
170 CARD32 flags; 160 CARD32 flags;
171 CARD32 functions; 161 CARD32 functions;
172 CARD32 decorations; 162 CARD32 decorations;
173 INT32 input_mode; 163 INT32 input_mode;
174 CARD32 status; 164 CARD32 status;
175} MWMHints; 165} MWMHints;
176#endif 166#endif
177 167
168#if ENABLE_XEMBED
169// XEMBED messages
170# define XEMBED_EMBEDDED_NOTIFY 0
171# define XEMBED_WINDOW_ACTIVATE 1
172# define XEMBED_WINDOW_DEACTIVATE 2
173# define XEMBED_REQUEST_FOCUS 3
174# define XEMBED_FOCUS_IN 4
175# define XEMBED_FOCUS_OUT 5
176# define XEMBED_FOCUS_NEXT 6
177# define XEMBED_FOCUS_PREV 7
178
179# define XEMBED_MODALITY_ON 10
180# define XEMBED_MODALITY_OFF 11
181# define XEMBED_REGISTER_ACCELERATOR 12
182# define XEMBED_UNREGISTER_ACCELERATOR 13
183# define XEMBED_ACTIVATE_ACCELERATOR 14
184
185// XEMBED detail code
186# define XEMBED_FOCUS_CURRENT 0
187# define XEMBED_FOCUS_FIRST 1
188# define XEMBED_FOCUS_LAST 2
189
190# define XEMBED_MAPPED (1 << 0)
191#endif
192
178/* 193/*
179 ***************************************************************************** 194 *****************************************************************************
180 * NORMAL DEFINES 195 * NORMAL DEFINES
181 ***************************************************************************** 196 *****************************************************************************
182 */ 197 */
… …
198 213
199#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
200# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
201#endif 216#endif
202 217
203#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
204# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
205#endif 220#endif
206 221
207/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
208 223
… …
232 247
233#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
234#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
235#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
236 251
237#define R_SB_RXVT 0
238#define R_SB_NEXT 1 252#define R_SB_NEXT 1
239#define R_SB_XTERM 2 253#define R_SB_XTERM 2
240#define R_SB_PLAIN 4 254#define R_SB_PLAIN 4
255#define R_SB_RXVT 8
241 256
242#define SB_WIDTH_NEXT 19 257#define SB_WIDTH_NEXT 19
243#define SB_WIDTH_XTERM 15 258#define SB_WIDTH_XTERM 15
244#define SB_WIDTH_PLAIN 7 259#define SB_WIDTH_PLAIN 7
245#ifndef SB_WIDTH_RXVT 260#ifndef SB_WIDTH_RXVT
… …
327#define FONT_DN "#-" 342#define FONT_DN "#-"
328#define FONT_UP "#+" 343#define FONT_UP "#+"
329 344
330/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
331enum { 346enum {
332 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
333 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
334 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
335}; 350};
336 351
337/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
338enum { 353enum {
339 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
… …
352enum { 367enum {
353 PRIMARY = 0, 368 PRIMARY = 0,
354 SECONDARY, 369 SECONDARY,
355}; 370};
356 371
357#define RS_None 0 /* Normal */ 372#define RS_None 0
358 373
359#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
360#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
361 376
362// font styles 377// font styles
363#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
364#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
365 380
366// fake styles 381// fake styles
367#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
368#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
369#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
370 385
371// 5 bits still to go 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
389#define RS_customShift 19
372 390
373// other flags 391// other flags
374#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
375 393
376#define RS_styleCount 4 394#define RS_styleCount 4
… …
438 XTerm_Color_UL = 19, // change actual 'Underline' color 456 XTerm_Color_UL = 19, // change actual 'Underline' color
439 XTerm_Pixmap = 20, // new bg pixmap 457 XTerm_Pixmap = 20, // new bg pixmap
440 XTerm_restoreFG = 39, // change default fg color 458 XTerm_restoreFG = 39, // change default fg color
441 XTerm_restoreBG = 49, // change default bg color 459 XTerm_restoreBG = 49, // change default bg color
442 XTerm_dumpscreen = 55, // dump scrollback and all of screen 460 XTerm_dumpscreen = 55, // dump scrollback and all of screen
461
443 XTerm_locale = 701, // change locale 462 URxvt_locale = 701, // change locale
444 XTerm_Menu = 703, // set menu item 463 URxvt_Menu = 703, // set menu item
445 XTerm_Color_IT = 704, // change actual 'Italic' colour 464 URxvt_Color_IT = 704, // change actual 'Italic' colour
446 XTerm_Color_tint = 705, // change actual tint colour 465 URxvt_Color_tint = 705, // change actual tint colour
447 466
448 URxvt_font = 710, 467 URxvt_font = 710,
449 URxvt_boldFont = 711, 468 URxvt_boldFont = 711,
450 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
451 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
471
472 URxvt_view_up = 720,
473 URxvt_view_down = 721,
452}; 474};
453 475
454/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
455/* 477/*
456 * The following comment is mostly obsolete since pixcolor_set was expanded:
457 * We're currently upto 29 colours. Only 3 more available. The
458 * PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
459 * on the unnecessary items, e.g. Color_pointer, but won't bother 479 * on the unnecessary items, e.g. Color_pointer, but won't bother
460 * until we need to. Also, be aware of usage in pixcolor_set 480 * until we need to. Also, be aware of usage in pixcolor_set
461 */ 481 */
462 482
463enum colour_list { 483enum colour_list {
… …
513 Color_trough, 533 Color_trough,
514#endif 534#endif
515#if TINTING 535#if TINTING
516 Color_tint, 536 Color_tint,
517#endif 537#endif
538#if OFF_FOCUS_FADING
539 Color_fade,
540#endif
518 NRS_COLORS, /* */ 541 NRS_COLORS, /* */
519#ifdef KEEP_SCROLLCOLOR 542#ifdef KEEP_SCROLLCOLOR
520 Color_topShadow = NRS_COLORS, 543 Color_topShadow = NRS_COLORS,
521 Color_bottomShadow, 544 Color_bottomShadow,
522 TOTAL_COLORS 545 TOTAL_COLORS
… …
544 Rs_font, 567 Rs_font,
545#if ENABLE_STYLES 568#if ENABLE_STYLES
546 Rs_boldFont, 569 Rs_boldFont,
547 Rs_italicFont, 570 Rs_italicFont,
548 Rs_boldItalicFont, 571 Rs_boldItalicFont,
572 Rs_intensityStyles,
549#endif 573#endif
550 Rs_name, 574 Rs_name,
551 Rs_title, 575 Rs_title,
552#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 576#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
553 Rs_path, 577 Rs_path,
… …
563#ifdef HAVE_SCROLLBARS 587#ifdef HAVE_SCROLLBARS
564 Rs_scrollBar, 588 Rs_scrollBar,
565 Rs_scrollBar_right, 589 Rs_scrollBar_right,
566 Rs_scrollBar_floating, 590 Rs_scrollBar_floating,
567 Rs_scrollBar_align, 591 Rs_scrollBar_align,
568#endif
569 Rs_scrollstyle, /* Rs_scrollBar_style */ 592 Rs_scrollstyle, /* Rs_scrollBar_style */
593 Rs_scrollBar_thickness,
594#endif
570 Rs_scrollTtyOutput, 595 Rs_scrollTtyOutput,
571 Rs_scrollTtyKeypress, 596 Rs_scrollTtyKeypress,
572 Rs_scrollWithBuffer, 597 Rs_scrollWithBuffer,
573 Rs_saveLines, 598 Rs_saveLines,
574 Rs_utmpInhibit, 599 Rs_utmpInhibit,
… …
599#ifdef TRANSPARENT 624#ifdef TRANSPARENT
600 Rs_transparent, 625 Rs_transparent,
601 Rs_transparent_all, 626 Rs_transparent_all,
602#endif 627#endif
603#if ENABLE_FRILLS 628#if ENABLE_FRILLS
629 Rs_pty_fd,
630 Rs_hold,
604 Rs_ext_bwidth, 631 Rs_ext_bwidth,
605 Rs_int_bwidth, 632 Rs_int_bwidth,
606 Rs_borderLess, 633 Rs_borderLess,
607#endif
608 Rs_scrollBar_thickness,
609#ifndef NO_LINESPACE
610 Rs_lineSpace, 634 Rs_lineSpace,
635 Rs_cursorUnderline,
636#endif
637#if CURSOR_BLINK
638 Rs_cursorBlink,
639#endif
640#if ENABLE_XEMBED
641 Rs_embed,
611#endif 642#endif
612 Rs_cutchars, 643 Rs_cutchars,
613 Rs_modifier, 644 Rs_modifier,
614 Rs_answerbackstring, 645 Rs_answerbackstring,
615 Rs_tripleclickwords, 646 Rs_tripleclickwords,
616 Rs_insecure, 647 Rs_insecure,
617 Rs_cursorBlink,
618 Rs_pointerBlank, 648 Rs_pointerBlank,
619 Rs_pointerBlankDelay, 649 Rs_pointerBlankDelay,
620 Rs_imLocale, 650 Rs_imLocale,
651 Rs_imFont,
621 Rs_pastableTabs, 652 Rs_pastableTabs,
622#ifndef NO_SECONDARY_SCREEN 653#ifndef NO_SECONDARY_SCREEN
623 Rs_secondaryScreen, 654 Rs_secondaryScreen,
624 Rs_secondaryScroll, 655 Rs_secondaryScroll,
625#endif 656#endif
… …
640 XA_MULTIPLE, 671 XA_MULTIPLE,
641 XA_TARGETS, 672 XA_TARGETS,
642 XA_TIMESTAMP, 673 XA_TIMESTAMP,
643 XA_VT_SELECTION, 674 XA_VT_SELECTION,
644 XA_INCR, 675 XA_INCR,
676 XA_WM_PROTOCOLS,
645 XA_WMDELETEWINDOW, 677 XA_WM_DELETE_WINDOW,
646 XA_CLIPBOARD, 678 XA_CLIPBOARD,
647#if ENABLE_FRILLS 679#if ENABLE_FRILLS
680 XA_MOTIF_WM_HINTS,
681#endif
682#if ENABLE_EWMH
648 XA_NET_WM_PID, 683 XA_NET_WM_PID,
649 XA_MOTIF_WM_HINTS,
650 XA_NET_WM_NAME, 684 XA_NET_WM_NAME,
651 XA_NET_WM_ICON_NAME, 685 XA_NET_WM_ICON_NAME,
686 XA_NET_WM_PING,
652#endif 687#endif
653#if USE_XIM 688#if USE_XIM
654 XA_WM_LOCALE_NAME, 689 XA_WM_LOCALE_NAME,
655#endif 690#endif
656#if TRANSPARENT 691#if TRANSPARENT
… …
658 XA_ESETROOT_PMAP_ID, 693 XA_ESETROOT_PMAP_ID,
659#endif 694#endif
660#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 695#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
661 XA_DNDPROTOCOL, 696 XA_DNDPROTOCOL,
662 XA_DNDSELECTION, 697 XA_DNDSELECTION,
698#endif
699#if ENABLE_XEMBED
700 XA_XEMBED,
701 XA_XEMBED_INFO,
663#endif 702#endif
664 NUM_XA 703 NUM_XA
665}; 704};
666 705
667/* DEC private modes */ 706/* DEC private modes */
… …
695 priv_modes |= (bit); \ 734 priv_modes |= (bit); \
696 else \ 735 else \
697 priv_modes &= ~(bit) 736 priv_modes &= ~(bit)
698 737
699#ifdef ALLOW_132_MODE 738#ifdef ALLOW_132_MODE
700# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 739# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
701#else 740#else
702# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 741# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
703#endif 742#endif
704 743
705// do not change these constants lightly, there are many interdependencies 744// do not change these constants lightly, there are many interdependencies
706#define IMBUFSIZ 128 // input modifier buffer sizes 745#define IMBUFSIZ 128 // input modifier buffer sizes
707#define KBUFSZ 512 // size of keyboard mapping buffer 746#define KBUFSZ 512 // size of keyboard mapping buffer
708#define CBUFSIZ 4096 // size of command buffer 747#define CBUFSIZ 2048 // size of command buffer
709#define UBUFSIZ 4096 // character buffer 748#define UBUFSIZ 2048 // character buffer
710 749
711#ifndef PATH_MAX 750#ifndef PATH_MAX
712# define PATH_MAX 16384 751# define PATH_MAX 16384
713#endif 752#endif
714 753
… …
758#define strdup(x) strdup((const char *)(x)) 797#define strdup(x) strdup((const char *)(x))
759#define strlen(x) strlen((const char *)(x)) 798#define strlen(x) strlen((const char *)(x))
760#define strchr(x, y) strchr((const char *)(x), (int)(y)) 799#define strchr(x, y) strchr((const char *)(x), (int)(y))
761#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 800#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
762 801
802#define dDisp Display *disp = display->display
803
763/* convert pixel dimensions to row/column values. Everything as int32_t */ 804/* convert pixel dimensions to row/column values. Everything as int32_t */
764#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 805#define Pixel2Col(x) Pixel2Width((int32_t)(x))
765#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 806#define Pixel2Row(y) Pixel2Height((int32_t)(y))
766#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 807#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
767#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 808#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
768#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 809#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
769#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 810#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
770#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 811#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
771#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 812#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
772 813
773#define TermWin_TotalWidth() ((int32_t)TermWin.width) 814#define TermWin_TotalWidth() ((int32_t)this->width)
774#define TermWin_TotalHeight() ((int32_t)TermWin.height) 815#define TermWin_TotalHeight() ((int32_t)this->height)
816
817// for m >= -n, ensure remainder lies between 0..n-1
818#define MOD(m,n) (((m) + (n)) % (n))
819
820#define LINENO(n) MOD (term_start + int(n), total_rows)
821#define ROW(n) row_buf [LINENO (n)]
775 822
776/* how to build & extract colors and attributes */ 823/* how to build & extract colors and attributes */
777#define GET_BASEFG(x) (((x) & RS_fgMask)) 824#define GET_BASEFG(x) (((x) & RS_fgMask))
778#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 825#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
779#ifndef NO_BRIGHTCOLOR
780# define GET_FGCOLOR(x) \
781 ((((x) & RS_Bold) == 0 \
782 || GET_BASEFG (x) < minCOLOR \
783 || GET_BASEFG (x) >= minBrightCOLOR) \
784 ? GET_BASEFG (x) \
785 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
786# define GET_BGCOLOR(x) \
787 ((((x) & RS_Blink) == 0 \
788 || GET_BASEBG (x) < minCOLOR \
789 || GET_BASEBG (x) >= minBrightCOLOR) \
790 ? GET_BASEBG (x) \
791 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
792#else
793# define GET_FGCOLOR(x) GET_BASEFG(x)
794# define GET_BGCOLOR(x) GET_BASEBG(x)
795#endif
796 826
797#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 827#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
798#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 828#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
799 829
800#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 830#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
813 843
814#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 844#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
815#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 845#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
816 846
817#if ENABLE_STYLES 847#if ENABLE_STYLES
818# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 848# define FONTSET(style) fontset[GET_STYLE (style)]
819#else 849#else
820# define FONTSET(style) TermWin.fontset[0] 850# define FONTSET(style) fontset[0]
821#endif 851#endif
822 852
823#ifdef HAVE_SCROLLBARS 853#ifdef HAVE_SCROLLBARS
824# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 854# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
825#else 855#else
… …
850#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 880#define scrollbar_size() (scrollBar.end - scrollBar.beg \
851 - scrollbar_minheight ()) 881 - scrollbar_minheight ())
852 882
853#if (MENUBAR_MAX > 1) 883#if (MENUBAR_MAX > 1)
854/* rendition style flags */ 884/* rendition style flags */
855# define menuBar_height() (TermWin.fheight + SHADOW) 885# define menuBar_height() (fheight + SHADOW)
856# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 886# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
857# define isMenuBarWindow(w) ((w) == menuBar.win) 887# define isMenuBarWindow(w) ((w) == menuBar.win)
858#else 888#else
859# define menuBar_height() (0) 889# define menuBar_height() (0)
860# define menuBar_TotalHeight() (0) 890# define menuBar_TotalHeight() (0)
… …
864#ifdef XPM_BACKGROUND 894#ifdef XPM_BACKGROUND
865# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 895# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
866#else 896#else
867# define XPMClearArea(a, b, c, d, e, f, g) 897# define XPMClearArea(a, b, c, d, e, f, g)
868#endif 898#endif
869
870#ifndef STRICT_FONT_CHECKING
871# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
872#endif
873
874#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
875#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
876 899
877#ifdef UTMP_SUPPORT 900#ifdef UTMP_SUPPORT
878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 901# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
879# undef HAVE_UTMPX_H 902# undef HAVE_UTMPX_H
880# undef HAVE_STRUCT_UTMPX 903# undef HAVE_STRUCT_UTMPX
… …
914#endif 937#endif
915 938
916extern class rxvt_failure_exception { } rxvt_failure_exception; 939extern class rxvt_failure_exception { } rxvt_failure_exception;
917 940
918typedef callback1<void, const char *> log_callback; 941typedef callback1<void, const char *> log_callback;
942typedef callback1<int, int> getfd_callback;
919 943
920extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 944extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
921extern void rxvt_log (const char *fmt, ...); 945extern void rxvt_log (const char *fmt, ...);
922extern void rxvt_warn (const char *fmt, ...); 946extern void rxvt_warn (const char *fmt, ...);
923extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 947extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
953 977
954 operator mbstate_t *() { return &mbs; } 978 operator mbstate_t *() { return &mbs; }
955 void reset () { memset (&mbs, 0, sizeof (mbs)); } 979 void reset () { memset (&mbs, 0, sizeof (mbs)); }
956 mbstate () { reset (); } 980 mbstate () { reset (); }
957}; 981};
982
983#define UNICODE_MASK 0x1fffffUL
958 984
959#if UNICODE3 985#if UNICODE3
960# define COMPOSE_LO 0x40000000UL 986# define COMPOSE_LO 0x40000000UL
961# define COMPOSE_HI 0x400fffffUL 987# define COMPOSE_HI 0x400fffffUL
962# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 988# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
992 1018
993extern class rxvt_composite_vec rxvt_composite; 1019extern class rxvt_composite_vec rxvt_composite;
994#endif 1020#endif
995 1021
996 1022
1023#ifdef KEYSYM_RESOURCE
1024 class keyboard_manager;
1025#endif
1026
997struct rxvt_term : zero_initialized, rxvt_vars { 1027struct rxvt_term : zero_initialized, rxvt_vars {
998 log_callback *log_hook; // log error messages through this hook, if != 0 1028 log_callback *log_hook; // log error messages through this hook, if != 0
1029 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1030
1031#if ENABLE_PERL
1032 void *self; // perl's $self
1033#endif
999 1034
1000 struct mbstate mbstate; // current input multibyte state 1035 struct mbstate mbstate; // current input multibyte state
1001 1036
1002 unsigned char want_refresh:1, 1037 unsigned char want_refresh:1,
1003#ifdef TRANSPARENT 1038#ifdef TRANSPARENT
… …
1018 hidden_text:1, 1053 hidden_text:1,
1019#endif 1054#endif
1020#ifdef POINTER_BLANK 1055#ifdef POINTER_BLANK
1021 hidden_pointer:1, 1056 hidden_pointer:1,
1022#endif 1057#endif
1023// enc_utf8:1, /* wether locale uses utf-8 */ 1058 enc_utf8:1, /* wether locale uses utf-8 */
1024 seen_input:1, /* wether we have seen some program output yet */ 1059 seen_input:1, /* wether we have seen some program output yet */
1025 seen_resize:1, /* wether we had a resize event */ 1060 seen_resize:1, /* wether we had a resize event */
1026 parsed_geometry:1; 1061 parsed_geometry:1;
1027 1062
1028 unsigned char refresh_type, 1063 unsigned char refresh_type,
… …
1074# ifdef POINTER_BLANK 1109# ifdef POINTER_BLANK
1075 pointerBlankDelay, 1110 pointerBlankDelay,
1076# endif 1111# endif
1077 allowedxerror; 1112 allowedxerror;
1078/* ---------- */ 1113/* ---------- */
1079 unsigned int ModMetaMask, 1114 unsigned int ModLevel3Mask,
1115 ModMetaMask,
1080 ModNumLockMask; 1116 ModNumLockMask;
1081 int old_width, /* last used width in screen resize */ 1117 int old_width, /* last used width in screen resize */
1082 old_height; /* last used height in screen resize */ 1118 old_height; /* last used height in screen resize */
1083 unsigned long priv_modes, 1119 unsigned long priv_modes,
1084 SavedModes; 1120 SavedModes;
… …
1118 pid_t cmd_pid; /* process id of child */ 1154 pid_t cmd_pid; /* process id of child */
1119 char * incr_buf; 1155 char * incr_buf;
1120 size_t incr_buf_size, incr_buf_fill; 1156 size_t incr_buf_size, incr_buf_fill;
1121/* ---------- */ 1157/* ---------- */
1122 Cursor leftptr_cursor; 1158 Cursor leftptr_cursor;
1123#ifdef POINTER_BLANK
1124 Cursor blank_cursor;
1125#endif
1126/* ---------- */ 1159/* ---------- */
1127#ifndef NO_BACKSPACE_KEY 1160#ifndef NO_BACKSPACE_KEY
1128 const char *key_backspace; 1161 const char *key_backspace;
1129#endif 1162#endif
1130#ifndef NO_DELETE_KEY 1163#ifndef NO_DELETE_KEY
… …
1175 void scr_overlay_off (); 1208 void scr_overlay_off ();
1176 void scr_overlay_set (int x, int y, 1209 void scr_overlay_set (int x, int y,
1177 text_t text, 1210 text_t text,
1178 rend_t rend = OVERLAY_RSTYLE); 1211 rend_t rend = OVERLAY_RSTYLE);
1179 void scr_overlay_set (int x, int y, const char *s); 1212 void scr_overlay_set (int x, int y, const char *s);
1213 void scr_overlay_set (int x, int y, const wchar_t *s);
1180#endif 1214#endif
1181 1215
1182 vector<void *> allocated; // free these memory blocks with free() 1216 vector<void *> allocated; // free these memory blocks with free()
1183 1217
1184 char *env_windowid; /* environmental variable WINDOWID */ 1218 char *env_windowid; /* environmental variable WINDOWID */
… …
1188 char *locale; 1222 char *locale;
1189 char charsets[4]; 1223 char charsets[4];
1190 unsigned char *v_buffer; /* pointer to physical buffer */ 1224 unsigned char *v_buffer; /* pointer to physical buffer */
1191 unsigned int v_buflen; /* size of area to write */ 1225 unsigned int v_buflen; /* size of area to write */
1192 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1226 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1227
1193#ifdef KEYSYM_RESOURCE 1228#ifdef KEYSYM_RESOURCE
1194 const unsigned char *Keysym_map[256]; 1229 keyboard_manager *keyboard;
1195#endif 1230#endif
1231
1196 const char *rs[NUM_RESOURCES]; 1232 const char *rs[NUM_RESOURCES];
1197 /* command input buffering */ 1233 /* command input buffering */
1198 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1234 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1199 unsigned char cmdbuf_base[CBUFSIZ]; 1235 unsigned char cmdbuf_base[CBUFSIZ];
1200 1236
… …
1207 // ISO 14755 entry support 1243 // ISO 14755 entry support
1208 unicode_t iso14755buf; 1244 unicode_t iso14755buf;
1209 void commit_iso14755 (); 1245 void commit_iso14755 ();
1210 int hex_keyval (XKeyEvent &ev); 1246 int hex_keyval (XKeyEvent &ev);
1211# if ISO_14755 1247# if ISO_14755
1212 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1248 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1213 void iso14755_54 (int x, int y); 1249 void iso14755_54 (int x, int y);
1214# endif 1250# endif
1215#endif 1251#endif
1216 1252
1217 // modifies first argument(!) 1253 // modifies first argument(!)
… …
1221 1257
1222#if TRANSPARENT 1258#if TRANSPARENT
1223 void rootwin_cb (XEvent &xev); 1259 void rootwin_cb (XEvent &xev);
1224 xevent_watcher rootwin_ev; 1260 xevent_watcher rootwin_ev;
1225#endif 1261#endif
1226
1227
1228 void sig_term (sig_watcher &w); sig_watcher sw_term;
1229 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1230 1262
1231 void x_cb (XEvent &xev); 1263 void x_cb (XEvent &xev);
1232 xevent_watcher termwin_ev; 1264 xevent_watcher termwin_ev;
1233 xevent_watcher vt_ev; 1265 xevent_watcher vt_ev;
1234#ifdef HAVE_SCROLLBARS 1266#ifdef HAVE_SCROLLBARS
… …
1275 1307
1276 void tt_winch (); 1308 void tt_winch ();
1277 1309
1278 rxvt_term (); 1310 rxvt_term ();
1279 ~rxvt_term (); 1311 ~rxvt_term ();
1312 void child_exit (); // child has exited, usually destroys
1280 void destroy (); 1313 void destroy ();
1314 void emergency_cleanup ();
1281 1315
1282 bool init (int argc, const char *const *argv); 1316 bool init (int argc, const char *const *argv);
1283 bool init_vars (); 1317 bool init_vars ();
1284 1318
1285 bool pty_fill (); 1319 bool pty_fill ();
… …
1294 int run_child (const char *const *argv); 1328 int run_child (const char *const *argv);
1295 1329
1296 void color_aliases (int idx); 1330 void color_aliases (int idx);
1297 void recolour_cursor (); 1331 void recolour_cursor ();
1298 void create_windows (int argc, const char *const *argv); 1332 void create_windows (int argc, const char *const *argv);
1299 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1333 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1300 void window_calc (unsigned int width, unsigned int height); 1334 void window_calc (unsigned int newwidth, unsigned int newheight);
1301 1335
1302#if USE_XIM 1336#if USE_XIM
1303 rxvt_xim *input_method; 1337 rxvt_xim *input_method;
1304 XIC Input_Context; 1338 XIC Input_Context;
1305 XIMStyle input_style; 1339 XIMStyle input_style;
… …
1339 1373
1340 bool cmd_parse (); 1374 bool cmd_parse ();
1341 void mouse_report (XButtonEvent &ev); 1375 void mouse_report (XButtonEvent &ev);
1342 void button_press (XButtonEvent &ev); 1376 void button_press (XButtonEvent &ev);
1343 void button_release (XButtonEvent &ev); 1377 void button_release (XButtonEvent &ev);
1378 void focus_in ();
1379 void focus_out ();
1344 int check_our_parents (); 1380 int check_our_parents ();
1345#ifdef PRINTPIPE 1381#ifdef PRINTPIPE
1346 FILE *popen_printer (); 1382 FILE *popen_printer ();
1347 int pclose_printer (FILE *stream); 1383 int pclose_printer (FILE *stream);
1348#endif 1384#endif
… …
1375 void set_title (const char *str); 1411 void set_title (const char *str);
1376 void set_icon_name (const char *str); 1412 void set_icon_name (const char *str);
1377 void set_window_color (int idx, const char *color); 1413 void set_window_color (int idx, const char *color);
1378 void set_colorfgbg (); 1414 void set_colorfgbg ();
1379 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1415 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1380 void set_widthheight (unsigned int width, unsigned int height); 1416 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1381 1417
1382#ifdef MENUBAR 1418#ifdef MENUBAR
1383 // menubar.C 1419 // menubar.C
1384 void menuitem_free (menu_t *menu, menuitem_t *item); 1420 void menuitem_free (menu_t *menu, menuitem_t *item);
1385 int action_dispatch (action_t *action); 1421 int action_dispatch (action_t *action);
… …
1411 void menubar_control (XButtonEvent &ev); 1447 void menubar_control (XButtonEvent &ev);
1412 void map_menuBar (int map); 1448 void map_menuBar (int map);
1413#endif 1449#endif
1414 1450
1415 // screen.C 1451 // screen.C
1416 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1452
1417 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1453 void lalloc (line_t &l)
1454 {
1455 l.t = (text_t *)talloc->alloc ();
1456 l.r = (rend_t *)ralloc->alloc ();
1457 }
1458
1459#if 0
1460 void lfree (line_t &l)
1461 {
1462 talloc->free (l.t);
1463 ralloc->free (l.r);
1464 }
1465#endif
1466
1467 void lresize (line_t &l)
1468 {
1469 if (!l.t)
1470 return;
1471
1472 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1473 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1474
1475 l.l = min (l.l, ncol);
1476
1477 if (ncol > prev_ncol)
1478 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1479 }
1480
1481 int fgcolor_of (rend_t r)
1482 {
1483 int base = GET_BASEFG (r);
1484#ifndef NO_BRIGHTCOLOR
1485 if (r & RS_Bold
1486# if ENABLE_STYLES
1487 && OPTION (Opt_intensityStyles)
1488# endif
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR;
1491#endif
1492 return base;
1493 }
1494
1495 int bgcolor_of (rend_t r)
1496 {
1497 int base = GET_BASEBG (r);
1498#ifndef NO_BRIGHTCOLOR
1499 if (r & RS_Blink
1500# if ENABLE_STYLES
1501 && OPTION (Opt_intensityStyles)
1502# endif
1503 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1504 base += minBrightCOLOR - minCOLOR;
1505#endif
1506 return base;
1507 }
1508
1509 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1510 void scr_blank_screen_mem (line_t &l, rend_t efs);
1418 int scr_scroll_text (int row1, int row2, int count, int spec); 1511 int scr_scroll_text (int row1, int row2, int count);
1419 void scr_reset (); 1512 void scr_reset ();
1420 void scr_reset_realloc ();
1421 void scr_release (); 1513 void scr_release ();
1422 void scr_clear (bool really = false); 1514 void scr_clear (bool really = false);
1423 void scr_refresh (unsigned char refresh_type); 1515 void scr_refresh (unsigned char refresh_type);
1424 bool scr_refresh_rend (rend_t mask, rend_t value); 1516 bool scr_refresh_rend (rend_t mask, rend_t value);
1425 void scr_erase_screen (int mode); 1517 void scr_erase_screen (int mode);
1518#if ENABLE_FRILLS
1519 void scr_erase_savelines ();
1520 void scr_backindex ();
1521 void scr_forwardindex ();
1522#endif
1426 void scr_touch (bool refresh); 1523 void scr_touch (bool refresh);
1427 void scr_expose (int x, int y, int width, int height, bool refresh); 1524 void scr_expose (int x, int y, int width, int height, bool refresh);
1428 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1525 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1429 void scr_recolour (); 1526 void scr_recolour ();
1430 void scr_remap_chars (); 1527 void scr_remap_chars ();
1431 void scr_remap_chars (text_t *tp, rend_t *rp); 1528 void scr_remap_chars (const line_t &l);
1432 1529
1433 void scr_poweron (); 1530 void scr_poweron ();
1434 void scr_cursor (int mode); 1531 void scr_cursor (int mode);
1435 void scr_do_wrap (); 1532 void scr_do_wrap ();
1436 int scr_change_screen (int scrn); 1533 int scr_change_screen (int scrn);
1437 void scr_color (unsigned int color, int fgbg); 1534 void scr_color (unsigned int color, int fgbg);
1438 void scr_rendition (int set, int style); 1535 void scr_rendition (int set, int style);
1439 void scr_add_lines (const unicode_t *str, int nlines, int len); 1536 void scr_add_lines (const unicode_t *str, int nlines, int len);
1440 void scr_backspace (); 1537 void scr_backspace ();
1441 void scr_tab (int count, bool ht = false); 1538 void scr_tab (int count, bool ht = false);
1442 void scr_backindex ();
1443 void scr_forwardindex ();
1444 void scr_gotorc (int row, int col, int relative); 1539 void scr_gotorc (int row, int col, int relative);
1445 void scr_index (enum page_dirn direction); 1540 void scr_index (enum page_dirn direction);
1446 void scr_erase_line (int mode); 1541 void scr_erase_line (int mode);
1447 void scr_E (); 1542 void scr_E ();
1448 void scr_insdel_lines (int count, int insdel); 1543 void scr_insdel_lines (int count, int insdel);
… …
1470 void selection_property (Window win, Atom prop); 1565 void selection_property (Window win, Atom prop);
1471 void selection_request (Time tm, int x, int y); 1566 void selection_request (Time tm, int x, int y);
1472 int selection_request_other (Atom target, int selnum); 1567 int selection_request_other (Atom target, int selnum);
1473 void selection_clear (); 1568 void selection_clear ();
1474 void selection_make (Time tm); 1569 void selection_make (Time tm);
1570 bool selection_grab (Time tm);
1475 void selection_start_colrow (int col, int row); 1571 void selection_start_colrow (int col, int row);
1476 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1572 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1477 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1573 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1478 void selection_remove_trailing_spaces (); 1574 void selection_remove_trailing_spaces ();
1479 void selection_send (const XSelectionRequestEvent &rq); 1575 void selection_send (const XSelectionRequestEvent &rq);
… …
1509 1605
1510 // xdefaults.C 1606 // xdefaults.C
1511 void get_options (int argc, const char *const *argv); 1607 void get_options (int argc, const char *const *argv);
1512 int parse_keysym (const char *str, const char *arg); 1608 int parse_keysym (const char *str, const char *arg);
1513 void get_xdefaults (FILE *stream, const char *name); 1609 void get_xdefaults (FILE *stream, const char *name);
1514 void extract_resources (Display *display, const char *name); 1610 void extract_resources ();
1515 // xpm.C 1611 // xpm.C
1516 int scale_pixmap (const char *geom); 1612 int scale_pixmap (const char *geom);
1517 void resize_pixmap (); 1613 void resize_pixmap ();
1518 Pixmap set_bgPixmap (const char *file); 1614 Pixmap set_bgPixmap (const char *file);
1519}; 1615};

Diff Legend

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