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.130 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.178 by root, Sun Jan 1 14:43: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 *****************************************************************************
… …
71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
73# define NO_SETOWNER_TTYDEV 1 79# define NO_SETOWNER_TTYDEV 1
74# endif 80# endif
75#endif 81#endif
76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY) 82#if defined(__CYGWIN32__)
77# define NO_SETOWNER_TTYDEV 1 83# define NO_SETOWNER_TTYDEV 1
78#endif 84#endif
79 85
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 = -1); 101char * rxvt_wcstombs (const wchar_t *str, int len = -1);
92wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 102wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
93char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 103char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
94wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 104wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
95char * rxvt_strdup (const char *str); 105char * rxvt_strdup (const char *str);
106
107// misc.C
96char * rxvt_r_basename (const char *str); 108char * rxvt_r_basename (const char *str);
97void rxvt_vlog (const char *fmt, va_list arg_ptr); 109void rxvt_vlog (const char *fmt, va_list arg_ptr);
98void rxvt_log (const char *fmt,...); 110void rxvt_log (const char *fmt,...);
99void rxvt_warn (const char *fmt,...); 111void rxvt_warn (const char *fmt,...);
100void rxvt_fatal (const char *fmt,...); 112void rxvt_fatal (const char *fmt,...);
… …
106char ** rxvt_splitcommastring (const char *cs); 118char ** rxvt_splitcommastring (const char *cs);
107void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
108char * 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);
109void 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);
110void 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);
111 123void rxvt_usleep (int usecs);
112void rxvt_privileges (rxvt_privaction action);
113 124
114/* 125/*
115 ***************************************************************************** 126 *****************************************************************************
116 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
117 ***************************************************************************** 128 *****************************************************************************
… …
127#endif 138#endif
128 139
129/* 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
130 * scrollColor resource. 141 * scrollColor resource.
131 */ 142 */
132#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
133# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
134#else 145#else
135# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
136#endif 147#endif
137 148
… …
151 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
152 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
153 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
154}; 165};
155 166
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 167#if ENABLE_FRILLS
169typedef struct _mwmhints { 168typedef struct _mwmhints {
170 CARD32 flags; 169 CARD32 flags;
171 CARD32 functions; 170 CARD32 functions;
172 CARD32 decorations; 171 CARD32 decorations;
173 INT32 input_mode; 172 INT32 input_mode;
174 CARD32 status; 173 CARD32 status;
175} MWMHints; 174} MWMHints;
176#endif 175#endif
177 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
178/* 202/*
179 ***************************************************************************** 203 *****************************************************************************
180 * NORMAL DEFINES 204 * NORMAL DEFINES
181 ***************************************************************************** 205 *****************************************************************************
182 */ 206 */
… …
232 256
233#define R_SB_ALIGN_CENTRE 0 257#define R_SB_ALIGN_CENTRE 0
234#define R_SB_ALIGN_TOP 1 258#define R_SB_ALIGN_TOP 1
235#define R_SB_ALIGN_BOTTOM 2 259#define R_SB_ALIGN_BOTTOM 2
236 260
237#define R_SB_RXVT 0
238#define R_SB_NEXT 1 261#define R_SB_NEXT 1
239#define R_SB_XTERM 2 262#define R_SB_XTERM 2
240#define R_SB_PLAIN 4 263#define R_SB_PLAIN 4
264#define R_SB_RXVT 8
241 265
242#define SB_WIDTH_NEXT 19 266#define SB_WIDTH_NEXT 19
243#define SB_WIDTH_XTERM 15 267#define SB_WIDTH_XTERM 15
244#define SB_WIDTH_PLAIN 7 268#define SB_WIDTH_PLAIN 7
245#ifndef SB_WIDTH_RXVT 269#ifndef SB_WIDTH_RXVT
… …
327#define FONT_DN "#-" 351#define FONT_DN "#-"
328#define FONT_UP "#+" 352#define FONT_UP "#+"
329 353
330/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
331enum { 355enum {
332 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
333 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
334 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
335}; 359};
336 360
337/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
338enum { 362enum {
339 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
… …
352enum { 376enum {
353 PRIMARY = 0, 377 PRIMARY = 0,
354 SECONDARY, 378 SECONDARY,
355}; 379};
356 380
357#define RS_None 0 /* Normal */ 381#define RS_None 0
358 382
359#define RS_fgMask 0x0000007fUL /* 128 colors */ 383#define RS_fgMask 0x0000007fUL // 128 colors
360#define RS_bgMask 0x00003f80UL /* 128 colors */ 384#define RS_bgMask 0x00003f80UL // 128 colors
361 385
362// font styles 386// font styles
363#define RS_Bold 0x00004000UL // value 1 387#define RS_Bold 0x00004000UL // value 1
364#define RS_Italic 0x00008000UL // value 2 388#define RS_Italic 0x00008000UL // value 2
365 389
366// fake styles 390// fake styles
367#define RS_Blink 0x00010000UL /* blink */ 391#define RS_Blink 0x00010000UL // blink
368#define RS_RVid 0x00020000UL /* reverse video */ 392#define RS_RVid 0x00020000UL // reverse video
369#define RS_Uline 0x00040000UL /* underline */ 393#define RS_Uline 0x00040000UL // underline
370 394
371// 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
372 399
373// other flags 400// other flags
374#define RS_Careful 0x80000000UL /* be careful when drawing these */ 401#define RS_Careful 0x80000000UL /* be careful when drawing these */
375 402
376#define RS_styleCount 4 403#define RS_styleCount 4
… …
438 XTerm_Color_UL = 19, // change actual 'Underline' color 465 XTerm_Color_UL = 19, // change actual 'Underline' color
439 XTerm_Pixmap = 20, // new bg pixmap 466 XTerm_Pixmap = 20, // new bg pixmap
440 XTerm_restoreFG = 39, // change default fg color 467 XTerm_restoreFG = 39, // change default fg color
441 XTerm_restoreBG = 49, // change default bg color 468 XTerm_restoreBG = 49, // change default bg color
442 XTerm_dumpscreen = 55, // dump scrollback and all of screen 469 XTerm_dumpscreen = 55, // dump scrollback and all of screen
470
443 XTerm_locale = 701, // change locale 471 URxvt_locale = 701, // change locale
444 XTerm_Menu = 703, // set menu item 472 URxvt_Menu = 703, // set menu item
445 XTerm_Color_IT = 704, // change actual 'Italic' colour 473 URxvt_Color_IT = 704, // change actual 'Italic' colour
446 XTerm_Color_tint = 705, // change actual tint colour 474 URxvt_Color_tint = 705, // change actual tint colour
447 475
448 URxvt_font = 710, 476 URxvt_font = 710,
449 URxvt_boldFont = 711, 477 URxvt_boldFont = 711,
450 URxvt_italicFont = 712, 478 URxvt_italicFont = 712,
451 URxvt_boldItalicFont = 713, 479 URxvt_boldItalicFont = 713,
480
481 URxvt_view_up = 720,
482 URxvt_view_down = 721,
452}; 483};
453 484
454/* Words starting with `Color_' are colours. Others are counts */ 485/* Words starting with `Color_' are colours. Others are counts */
455/* 486/*
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 487 * The PixColor and rendition colour usage should probably be decoupled
459 * 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
460 * 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
461 */ 490 */
462 491
463enum colour_list { 492enum colour_list {
… …
500 Color_BD, 529 Color_BD,
501 Color_IT, 530 Color_IT,
502 Color_UL, 531 Color_UL,
503 Color_RV, 532 Color_RV,
504#endif 533#endif
534#if ENABLE_FRILLS
535 Color_underline,
536#endif
505#ifdef OPTION_HC 537#ifdef OPTION_HC
506 Color_HC, 538 Color_HC,
507#endif 539#endif
508#ifdef KEEP_SCROLLCOLOR 540#ifdef KEEP_SCROLLCOLOR
509 Color_scroll, 541 Color_scroll,
510 Color_trough, 542 Color_trough,
511#endif 543#endif
512#if TINTING 544#if TINTING
513 Color_tint, 545 Color_tint,
546#endif
547#if OFF_FOCUS_FADING
548 Color_fade,
514#endif 549#endif
515 NRS_COLORS, /* */ 550 NRS_COLORS, /* */
516#ifdef KEEP_SCROLLCOLOR 551#ifdef KEEP_SCROLLCOLOR
517 Color_topShadow = NRS_COLORS, 552 Color_topShadow = NRS_COLORS,
518 Color_bottomShadow, 553 Color_bottomShadow,
… …
541 Rs_font, 576 Rs_font,
542#if ENABLE_STYLES 577#if ENABLE_STYLES
543 Rs_boldFont, 578 Rs_boldFont,
544 Rs_italicFont, 579 Rs_italicFont,
545 Rs_boldItalicFont, 580 Rs_boldItalicFont,
581 Rs_intensityStyles,
546#endif 582#endif
547 Rs_name, 583 Rs_name,
548 Rs_title, 584 Rs_title,
549#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 585#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
550 Rs_path, 586 Rs_path,
… …
560#ifdef HAVE_SCROLLBARS 596#ifdef HAVE_SCROLLBARS
561 Rs_scrollBar, 597 Rs_scrollBar,
562 Rs_scrollBar_right, 598 Rs_scrollBar_right,
563 Rs_scrollBar_floating, 599 Rs_scrollBar_floating,
564 Rs_scrollBar_align, 600 Rs_scrollBar_align,
565#endif
566 Rs_scrollstyle, /* Rs_scrollBar_style */ 601 Rs_scrollstyle, /* Rs_scrollBar_style */
602 Rs_scrollBar_thickness,
603#endif
567 Rs_scrollTtyOutput, 604 Rs_scrollTtyOutput,
568 Rs_scrollTtyKeypress, 605 Rs_scrollTtyKeypress,
569 Rs_scrollWithBuffer, 606 Rs_scrollWithBuffer,
570 Rs_saveLines, 607 Rs_saveLines,
571 Rs_utmpInhibit, 608 Rs_utmpInhibit,
… …
596#ifdef TRANSPARENT 633#ifdef TRANSPARENT
597 Rs_transparent, 634 Rs_transparent,
598 Rs_transparent_all, 635 Rs_transparent_all,
599#endif 636#endif
600#if ENABLE_FRILLS 637#if ENABLE_FRILLS
638 Rs_pty_fd,
639 Rs_hold,
601 Rs_ext_bwidth, 640 Rs_ext_bwidth,
602 Rs_int_bwidth, 641 Rs_int_bwidth,
603 Rs_borderLess, 642 Rs_borderLess,
604#endif
605 Rs_scrollBar_thickness,
606#ifndef NO_LINESPACE
607 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,
608#endif 651#endif
609 Rs_cutchars, 652 Rs_cutchars,
610 Rs_modifier, 653 Rs_modifier,
611 Rs_answerbackstring, 654 Rs_answerbackstring,
612 Rs_tripleclickwords, 655 Rs_tripleclickwords,
613 Rs_insecure, 656 Rs_insecure,
614 Rs_cursorBlink,
615 Rs_pointerBlank, 657 Rs_pointerBlank,
616 Rs_pointerBlankDelay, 658 Rs_pointerBlankDelay,
617 Rs_imLocale, 659 Rs_imLocale,
660 Rs_imFont,
618 Rs_pastableTabs, 661 Rs_pastableTabs,
619#ifndef NO_SECONDARY_SCREEN 662#ifndef NO_SECONDARY_SCREEN
620 Rs_secondaryScreen, 663 Rs_secondaryScreen,
621 Rs_secondaryScroll, 664 Rs_secondaryScroll,
622#endif 665#endif
… …
637 XA_MULTIPLE, 680 XA_MULTIPLE,
638 XA_TARGETS, 681 XA_TARGETS,
639 XA_TIMESTAMP, 682 XA_TIMESTAMP,
640 XA_VT_SELECTION, 683 XA_VT_SELECTION,
641 XA_INCR, 684 XA_INCR,
685 XA_WM_PROTOCOLS,
642 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
643#ifdef TRANSPARENT 700#if TRANSPARENT
644 XA_XROOTPMAPID, 701 XA_XROOTPMAP_ID,
645 XA_XSETROOTID, 702 XA_ESETROOT_PMAP_ID,
646#endif 703#endif
647#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 704#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
648 XA_DNDPROTOCOL, 705 XA_DNDPROTOCOL,
649 XA_DNDSELECTION, 706 XA_DNDSELECTION,
650#endif /* OFFIX_DND */ 707#endif
651 XA_CLIPBOARD, 708#if ENABLE_XEMBED
709 XA_XEMBED,
710 XA_XEMBED_INFO,
711#endif
652 NUM_XA 712 NUM_XA
653}; 713};
654 714
655/* DEC private modes */ 715/* DEC private modes */
656#define PrivMode_132 (1UL<<0) 716#define PrivMode_132 (1UL<<0)
… …
683 priv_modes |= (bit); \ 743 priv_modes |= (bit); \
684 else \ 744 else \
685 priv_modes &= ~(bit) 745 priv_modes &= ~(bit)
686 746
687#ifdef ALLOW_132_MODE 747#ifdef ALLOW_132_MODE
688# 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)
689#else 749#else
690# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 750# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
691#endif 751#endif
692 752
693// do not change these constants lightly, there are many interdependencies 753// do not change these constants lightly, there are many interdependencies
694#define IMBUFSIZ 128 // input modifier buffer sizes 754#define IMBUFSIZ 128 // input modifier buffer sizes
695#define KBUFSZ 512 // size of keyboard mapping buffer 755#define KBUFSZ 512 // size of keyboard mapping buffer
696#define CBUFSIZ 4096 // size of command buffer 756#define CBUFSIZ 2048 // size of command buffer
697#define UBUFSIZ 4096 // character buffer 757#define UBUFSIZ 2048 // character buffer
698 758
699#ifndef PATH_MAX 759#ifndef PATH_MAX
700# define PATH_MAX 16384 760# define PATH_MAX 16384
701#endif 761#endif
702 762
… …
746#define strdup(x) strdup((const char *)(x)) 806#define strdup(x) strdup((const char *)(x))
747#define strlen(x) strlen((const char *)(x)) 807#define strlen(x) strlen((const char *)(x))
748#define strchr(x, y) strchr((const char *)(x), (int)(y)) 808#define strchr(x, y) strchr((const char *)(x), (int)(y))
749#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 809#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
750 810
811#define dDisp Display *disp = display->display
812
751/* convert pixel dimensions to row/column values. Everything as int32_t */ 813/* convert pixel dimensions to row/column values. Everything as int32_t */
752#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 814#define Pixel2Col(x) Pixel2Width((int32_t)(x))
753#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 815#define Pixel2Row(y) Pixel2Height((int32_t)(y))
754#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 816#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
755#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 817#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
756#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 818#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
757#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 819#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
758#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 820#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
759#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 821#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
760 822
761#define TermWin_TotalWidth() ((int32_t)TermWin.width) 823#define TermWin_TotalWidth() ((int32_t)this->width)
762#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)]
763 831
764/* how to build & extract colors and attributes */ 832/* how to build & extract colors and attributes */
765#define GET_BASEFG(x) (((x) & RS_fgMask)) 833#define GET_BASEFG(x) (((x) & RS_fgMask))
766#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 834#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
767#ifndef NO_BRIGHTCOLOR
768# define GET_FGCOLOR(x) \
769 ((((x) & RS_Bold) == 0 \
770 || GET_BASEFG (x) < minCOLOR \
771 || GET_BASEFG (x) >= minBrightCOLOR) \
772 ? GET_BASEFG (x) \
773 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
774# define GET_BGCOLOR(x) \
775 ((((x) & RS_Blink) == 0 \
776 || GET_BASEBG (x) < minCOLOR \
777 || GET_BASEBG (x) >= minBrightCOLOR) \
778 ? GET_BASEBG (x) \
779 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
780#else
781# define GET_FGCOLOR(x) GET_BASEFG(x)
782# define GET_BGCOLOR(x) GET_BASEBG(x)
783#endif
784 835
785#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 836#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
786#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 837#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
787 838
788#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 839#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
801 852
802#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)))
803#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)))
804 855
805#if ENABLE_STYLES 856#if ENABLE_STYLES
806# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 857# define FONTSET(style) fontset[GET_STYLE (style)]
807#else 858#else
808# define FONTSET(style) TermWin.fontset[0] 859# define FONTSET(style) fontset[0]
809#endif 860#endif
810 861
811#ifdef HAVE_SCROLLBARS 862#ifdef HAVE_SCROLLBARS
812# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 863# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
813#else 864#else
… …
838#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 889#define scrollbar_size() (scrollBar.end - scrollBar.beg \
839 - scrollbar_minheight ()) 890 - scrollbar_minheight ())
840 891
841#if (MENUBAR_MAX > 1) 892#if (MENUBAR_MAX > 1)
842/* rendition style flags */ 893/* rendition style flags */
843# define menuBar_height() (TermWin.fheight + SHADOW) 894# define menuBar_height() (fheight + SHADOW)
844# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 895# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
845# define isMenuBarWindow(w) ((w) == menuBar.win) 896# define isMenuBarWindow(w) ((w) == menuBar.win)
846#else 897#else
847# define menuBar_height() (0) 898# define menuBar_height() (0)
848# define menuBar_TotalHeight() (0) 899# define menuBar_TotalHeight() (0)
… …
852#ifdef XPM_BACKGROUND 903#ifdef XPM_BACKGROUND
853# 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))
854#else 905#else
855# define XPMClearArea(a, b, c, d, e, f, g) 906# define XPMClearArea(a, b, c, d, e, f, g)
856#endif 907#endif
857
858#ifndef STRICT_FONT_CHECKING
859# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
860#endif
861
862#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
863#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
864 908
865#ifdef UTMP_SUPPORT 909#ifdef UTMP_SUPPORT
866# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 910# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
867# undef HAVE_UTMPX_H 911# undef HAVE_UTMPX_H
868# undef HAVE_STRUCT_UTMPX 912# undef HAVE_STRUCT_UTMPX
… …
902#endif 946#endif
903 947
904extern class rxvt_failure_exception { } rxvt_failure_exception; 948extern class rxvt_failure_exception { } rxvt_failure_exception;
905 949
906typedef callback1<void, const char *> log_callback; 950typedef callback1<void, const char *> log_callback;
951typedef callback1<int, int> getfd_callback;
907 952
908extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 953extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
909extern void rxvt_log (const char *fmt, ...); 954extern void rxvt_log (const char *fmt, ...);
910extern void rxvt_warn (const char *fmt, ...); 955extern void rxvt_warn (const char *fmt, ...);
911extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 956extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
941 986
942 operator mbstate_t *() { return &mbs; } 987 operator mbstate_t *() { return &mbs; }
943 void reset () { memset (&mbs, 0, sizeof (mbs)); } 988 void reset () { memset (&mbs, 0, sizeof (mbs)); }
944 mbstate () { reset (); } 989 mbstate () { reset (); }
945}; 990};
991
992#define UNICODE_MASK 0x1fffffUL
946 993
947#if UNICODE3 994#if UNICODE3
948# define COMPOSE_LO 0x40000000UL 995# define COMPOSE_LO 0x40000000UL
949# define COMPOSE_HI 0x400fffffUL 996# define COMPOSE_HI 0x400fffffUL
950# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 997# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
980 1027
981extern class rxvt_composite_vec rxvt_composite; 1028extern class rxvt_composite_vec rxvt_composite;
982#endif 1029#endif
983 1030
984 1031
1032#ifdef KEYSYM_RESOURCE
1033 class keyboard_manager;
1034#endif
1035
985struct rxvt_term : zero_initialized, rxvt_vars { 1036struct rxvt_term : zero_initialized, rxvt_vars {
986 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
987 1039
988 struct mbstate mbstate; // current input multibyte state 1040 struct mbstate mbstate; // current input multibyte state
989 1041
990 unsigned char want_refresh:1, 1042 unsigned char want_refresh:1,
991#ifdef TRANSPARENT 1043#ifdef TRANSPARENT
… …
1006 hidden_text:1, 1058 hidden_text:1,
1007#endif 1059#endif
1008#ifdef POINTER_BLANK 1060#ifdef POINTER_BLANK
1009 hidden_pointer:1, 1061 hidden_pointer:1,
1010#endif 1062#endif
1011// enc_utf8:1, /* wether locale uses utf-8 */ 1063 enc_utf8:1, /* wether locale uses utf-8 */
1012 seen_input:1, /* wether we have seen some program output yet */ 1064 seen_input:1, /* wether we have seen some program output yet */
1013 seen_resize:1, /* wether we had a resize event */ 1065 seen_resize:1, /* wether we had a resize event */
1014 parsed_geometry:1; 1066 parsed_geometry:1;
1015 1067
1016 unsigned char refresh_type, 1068 unsigned char refresh_type,
… …
1062# ifdef POINTER_BLANK 1114# ifdef POINTER_BLANK
1063 pointerBlankDelay, 1115 pointerBlankDelay,
1064# endif 1116# endif
1065 allowedxerror; 1117 allowedxerror;
1066/* ---------- */ 1118/* ---------- */
1067 unsigned int ModMetaMask, 1119 unsigned int ModLevel3Mask,
1120 ModMetaMask,
1068 ModNumLockMask; 1121 ModNumLockMask;
1069 int old_width, /* last used width in screen resize */ 1122 int old_width, /* last used width in screen resize */
1070 old_height; /* last used height in screen resize */ 1123 old_height; /* last used height in screen resize */
1071 unsigned long priv_modes, 1124 unsigned long priv_modes,
1072 SavedModes; 1125 SavedModes;
… …
1106 pid_t cmd_pid; /* process id of child */ 1159 pid_t cmd_pid; /* process id of child */
1107 char * incr_buf; 1160 char * incr_buf;
1108 size_t incr_buf_size, incr_buf_fill; 1161 size_t incr_buf_size, incr_buf_fill;
1109/* ---------- */ 1162/* ---------- */
1110 Cursor leftptr_cursor; 1163 Cursor leftptr_cursor;
1111#ifdef POINTER_BLANK
1112 Cursor blank_cursor;
1113#endif
1114/* ---------- */ 1164/* ---------- */
1115#ifndef NO_BACKSPACE_KEY 1165#ifndef NO_BACKSPACE_KEY
1116 const char *key_backspace; 1166 const char *key_backspace;
1117#endif 1167#endif
1118#ifndef NO_DELETE_KEY 1168#ifndef NO_DELETE_KEY
… …
1163 void scr_overlay_off (); 1213 void scr_overlay_off ();
1164 void scr_overlay_set (int x, int y, 1214 void scr_overlay_set (int x, int y,
1165 text_t text, 1215 text_t text,
1166 rend_t rend = OVERLAY_RSTYLE); 1216 rend_t rend = OVERLAY_RSTYLE);
1167 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);
1168#endif 1219#endif
1169 1220
1170 vector<void *> allocated; // free these memory blocks with free() 1221 vector<void *> allocated; // free these memory blocks with free()
1171 1222
1172 char *env_windowid; /* environmental variable WINDOWID */ 1223 char *env_windowid; /* environmental variable WINDOWID */
… …
1176 char *locale; 1227 char *locale;
1177 char charsets[4]; 1228 char charsets[4];
1178 unsigned char *v_buffer; /* pointer to physical buffer */ 1229 unsigned char *v_buffer; /* pointer to physical buffer */
1179 unsigned int v_buflen; /* size of area to write */ 1230 unsigned int v_buflen; /* size of area to write */
1180 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1231 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1232
1181#ifdef KEYSYM_RESOURCE 1233#ifdef KEYSYM_RESOURCE
1182 const unsigned char *Keysym_map[256]; 1234 keyboard_manager *keyboard;
1183#endif 1235#endif
1236
1184 const char *rs[NUM_RESOURCES]; 1237 const char *rs[NUM_RESOURCES];
1185 /* command input buffering */ 1238 /* command input buffering */
1186 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1239 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1187 unsigned char cmdbuf_base[CBUFSIZ]; 1240 unsigned char cmdbuf_base[CBUFSIZ];
1188 1241
… …
1195 // ISO 14755 entry support 1248 // ISO 14755 entry support
1196 unicode_t iso14755buf; 1249 unicode_t iso14755buf;
1197 void commit_iso14755 (); 1250 void commit_iso14755 ();
1198 int hex_keyval (XKeyEvent &ev); 1251 int hex_keyval (XKeyEvent &ev);
1199# if ISO_14755 1252# if ISO_14755
1200 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);
1201 void iso14755_54 (int x, int y); 1254 void iso14755_54 (int x, int y);
1202# endif 1255# endif
1203#endif 1256#endif
1204 1257
1258 // modifies first argument(!)
1205 void paste (const unsigned char *data, unsigned int len); 1259 void paste (unsigned char *data, unsigned int len);
1206 1260
1207 void flush (); 1261 void flush ();
1208 1262
1209#if TRANSPARENT 1263#if TRANSPARENT
1210 void rootwin_cb (XEvent &xev); 1264 void rootwin_cb (XEvent &xev);
1211 xevent_watcher rootwin_ev; 1265 xevent_watcher rootwin_ev;
1212#endif 1266#endif
1213
1214
1215 void sig_term (sig_watcher &w); sig_watcher sw_term;
1216 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1217 1267
1218 void x_cb (XEvent &xev); 1268 void x_cb (XEvent &xev);
1219 xevent_watcher termwin_ev; 1269 xevent_watcher termwin_ev;
1220 xevent_watcher vt_ev; 1270 xevent_watcher vt_ev;
1221#ifdef HAVE_SCROLLBARS 1271#ifdef HAVE_SCROLLBARS
… …
1262 1312
1263 void tt_winch (); 1313 void tt_winch ();
1264 1314
1265 rxvt_term (); 1315 rxvt_term ();
1266 ~rxvt_term (); 1316 ~rxvt_term ();
1317 void child_exit (); // child has exited, usually destroys
1267 void destroy (); 1318 void destroy ();
1319 void emergency_cleanup ();
1268 1320
1269 bool init (int argc, const char *const *argv); 1321 bool init (int argc, const char *const *argv);
1270 bool init_vars (); 1322 bool init_vars ();
1271 1323
1272 bool pty_fill (); 1324 bool pty_fill ();
… …
1281 int run_child (const char *const *argv); 1333 int run_child (const char *const *argv);
1282 1334
1283 void color_aliases (int idx); 1335 void color_aliases (int idx);
1284 void recolour_cursor (); 1336 void recolour_cursor ();
1285 void create_windows (int argc, const char *const *argv); 1337 void create_windows (int argc, const char *const *argv);
1286 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);
1287 void window_calc (unsigned int width, unsigned int height); 1339 void window_calc (unsigned int newwidth, unsigned int newheight);
1288 1340
1289#if USE_XIM 1341#if USE_XIM
1290 rxvt_xim *input_method; 1342 rxvt_xim *input_method;
1291 XIC Input_Context; 1343 XIC Input_Context;
1292 XIMStyle input_style; 1344 XIMStyle input_style;
… …
1326 1378
1327 bool cmd_parse (); 1379 bool cmd_parse ();
1328 void mouse_report (XButtonEvent &ev); 1380 void mouse_report (XButtonEvent &ev);
1329 void button_press (XButtonEvent &ev); 1381 void button_press (XButtonEvent &ev);
1330 void button_release (XButtonEvent &ev); 1382 void button_release (XButtonEvent &ev);
1383 void focus_in ();
1384 void focus_out ();
1331 int check_our_parents (); 1385 int check_our_parents ();
1332#ifdef PRINTPIPE 1386#ifdef PRINTPIPE
1333 FILE *popen_printer (); 1387 FILE *popen_printer ();
1334 int pclose_printer (FILE *stream); 1388 int pclose_printer (FILE *stream);
1335#endif 1389#endif
… …
1362 void set_title (const char *str); 1416 void set_title (const char *str);
1363 void set_icon_name (const char *str); 1417 void set_icon_name (const char *str);
1364 void set_window_color (int idx, const char *color); 1418 void set_window_color (int idx, const char *color);
1365 void set_colorfgbg (); 1419 void set_colorfgbg ();
1366 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1420 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1367 void set_widthheight (unsigned int width, unsigned int height); 1421 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1368 1422
1369#ifdef MENUBAR 1423#ifdef MENUBAR
1370 // menubar.C 1424 // menubar.C
1371 void menuitem_free (menu_t *menu, menuitem_t *item); 1425 void menuitem_free (menu_t *menu, menuitem_t *item);
1372 int action_dispatch (action_t *action); 1426 int action_dispatch (action_t *action);
… …
1398 void menubar_control (XButtonEvent &ev); 1452 void menubar_control (XButtonEvent &ev);
1399 void map_menuBar (int map); 1453 void map_menuBar (int map);
1400#endif 1454#endif
1401 1455
1402 // screen.C 1456 // screen.C
1403 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1457
1404 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);
1405 int scr_scroll_text (int row1, int row2, int count, int spec); 1516 int scr_scroll_text (int row1, int row2, int count);
1406 void scr_reset (); 1517 void scr_reset ();
1407 void scr_reset_realloc ();
1408 void scr_release (); 1518 void scr_release ();
1409 void scr_clear (bool really = false); 1519 void scr_clear (bool really = false);
1410 void scr_refresh (unsigned char refresh_type); 1520 void scr_refresh (unsigned char refresh_type);
1411 bool scr_refresh_rend (rend_t mask, rend_t value); 1521 bool scr_refresh_rend (rend_t mask, rend_t value);
1412 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
1413 void scr_touch (bool refresh); 1528 void scr_touch (bool refresh);
1414 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);
1415 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1530 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1416 void scr_recolour (); 1531 void scr_recolour ();
1417 void scr_remap_chars (); 1532 void scr_remap_chars ();
1418 void scr_remap_chars (text_t *tp, rend_t *rp); 1533 void scr_remap_chars (const line_t &l);
1419 1534
1420 void scr_poweron (); 1535 void scr_poweron ();
1421 void scr_cursor (int mode); 1536 void scr_cursor (int mode);
1422 void scr_do_wrap (); 1537 void scr_do_wrap ();
1423 int scr_change_screen (int scrn); 1538 int scr_change_screen (int scrn);
1424 void scr_color (unsigned int color, int fgbg); 1539 void scr_color (unsigned int color, int fgbg);
1425 void scr_rendition (int set, int style); 1540 void scr_rendition (int set, int style);
1426 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);
1427 void scr_backspace (); 1542 void scr_backspace ();
1428 void scr_tab (int count, bool ht = false); 1543 void scr_tab (int count, bool ht = false);
1429 void scr_backindex ();
1430 void scr_forwardindex ();
1431 void scr_gotorc (int row, int col, int relative); 1544 void scr_gotorc (int row, int col, int relative);
1432 void scr_index (enum page_dirn direction); 1545 void scr_index (enum page_dirn direction);
1433 void scr_erase_line (int mode); 1546 void scr_erase_line (int mode);
1434 void scr_E (); 1547 void scr_E ();
1435 void scr_insdel_lines (int count, int insdel); 1548 void scr_insdel_lines (int count, int insdel);
… …
1496 1609
1497 // xdefaults.C 1610 // xdefaults.C
1498 void get_options (int argc, const char *const *argv); 1611 void get_options (int argc, const char *const *argv);
1499 int parse_keysym (const char *str, const char *arg); 1612 int parse_keysym (const char *str, const char *arg);
1500 void get_xdefaults (FILE *stream, const char *name); 1613 void get_xdefaults (FILE *stream, const char *name);
1501 void extract_resources (Display *display, const char *name); 1614 void extract_resources ();
1502 // xpm.C 1615 // xpm.C
1503 int scale_pixmap (const char *geom); 1616 int scale_pixmap (const char *geom);
1504 void resize_pixmap (); 1617 void resize_pixmap ();
1505 Pixmap set_bgPixmap (const char *file); 1618 Pixmap set_bgPixmap (const char *file);
1506}; 1619};

Diff Legend

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