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.60 by pcg, Mon Mar 22 15:15:04 2004 UTC vs.
Revision 1.149 by root, Thu Feb 17 15:07:48 2005 UTC

… …
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include "rxvtlib.h" 4#include "rxvtlib.h"
5 5
6#include "feature.h" 6#include "feature.h"
7
8#include <limits.h>
7 9
8#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
9#include <X11/keysym.h> 11#include <X11/keysym.h>
10#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
11#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS
15# include <X11/Xmd.h>
16#endif
12 17
13#include "encoding.h" 18#include "encoding.h"
14#include "defaultfont.h"
15#include "rxvtcolor.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h"
16#include "iom.h" 21#include "iom.h"
17#include "salloc.h" 22#include "salloc.h"
18 23
19/* 24/*
20 ***************************************************************************** 25 *****************************************************************************
… …
23 */ 28 */
24/* Consistent defines - please report on the necessity 29/* Consistent defines - please report on the necessity
25 * @ Unixware: defines (__svr4__) 30 * @ Unixware: defines (__svr4__)
26 */ 31 */
27#if defined (SVR4) && !defined (__svr4__) 32#if defined (SVR4) && !defined (__svr4__)
28# define __svr4__ 33# define __svr4__ 1
29#endif 34#endif
30#if defined (sun) && !defined (__sun__) 35#if defined (sun) && !defined (__sun__)
31# define __sun__ 36# define __sun__ 1
32#endif 37#endif
33 38
34#ifndef HAVE_XPOINTER 39#ifndef HAVE_XPOINTER
35typedef char *XPointer; 40typedef char *XPointer;
36#endif 41#endif
… …
63# define STDERR_FILENO 2 68# define STDERR_FILENO 2
64#endif 69#endif
65 70
66#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
67# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
68# define NO_SETOWNER_TTYDEV 73# define NO_SETOWNER_TTYDEV 1
69# endif 74# endif
70#endif 75#endif
71#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY) 76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
72# define NO_SETOWNER_TTYDEV 77# define NO_SETOWNER_TTYDEV 1
73#endif 78#endif
79
80/*
81 *****************************************************************************
82 * PROTOTYPES
83 *****************************************************************************
84 */
85// main.C
86RETSIGTYPE rxvt_Child_signal (int sig);
87RETSIGTYPE rxvt_Exit_signal (int sig);
88void rxvt_clean_exit ();
89void * rxvt_malloc (size_t size);
90void * rxvt_calloc (size_t number, size_t size);
91void * rxvt_realloc (void *ptr, size_t size);
92void rxvt_privileges (rxvt_privaction action);
93
94// util.C
95char * rxvt_wcstombs (const wchar_t *str, int len = -1);
96wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
97char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
98wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
99char * rxvt_strdup (const char *str);
100
101// misc.C
102char * rxvt_r_basename (const char *str);
103void rxvt_vlog (const char *fmt, va_list arg_ptr);
104void rxvt_log (const char *fmt,...);
105void rxvt_warn (const char *fmt,...);
106void rxvt_fatal (const char *fmt,...);
107void rxvt_exit_failure ();
108int rxvt_Str_match (const char *s1, const char *s2);
109const char * rxvt_Str_skip_space (const char *str);
110char * rxvt_Str_trim (char *str);
111int rxvt_Str_escaped (char *str);
112char ** rxvt_splitcommastring (const char *cs);
113void rxvt_freecommastring (char **cs);
114char * rxvt_File_find (const char *file, const char *ext, const char *path);
115void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
116void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
74 117
75/* 118/*
76 ***************************************************************************** 119 *****************************************************************************
77 * STRUCTURES AND TYPEDEFS 120 * STRUCTURES AND TYPEDEFS
78 ***************************************************************************** 121 *****************************************************************************
… …
88#endif 131#endif
89 132
90/* If we're using either the rxvt scrollbar or menu bars, keep the 133/* If we're using either the rxvt scrollbar or menu bars, keep the
91 * scrollColor resource. 134 * scrollColor resource.
92 */ 135 */
93#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 136#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
94# define KEEP_SCROLLCOLOR 1 137# define KEEP_SCROLLCOLOR 1
95#else 138#else
96# undef KEEP_SCROLLCOLOR 139# undef KEEP_SCROLLCOLOR
97#endif 140#endif
98 141
99#ifdef XPM_BACKGROUND 142#ifdef XPM_BACKGROUND
100typedef struct { 143typedef struct {
101 short w, h, x, y; 144 short w, h, x, y;
102 Pixmap pixmap; 145 Pixmap pixmap;
103} bgPixmap_t; 146} bgPixmap_t;
104#endif 147#endif
105 148
106/* 149/*
107 * the 'essential' information for reporting Mouse Events 150 * the 'essential' information for reporting Mouse Events
108 * pared down from XButtonEvent 151 * pared down from XButtonEvent
109 */ 152 */
110struct mouse_event { 153struct mouse_event {
111 int clicks; 154 int clicks;
112 Time time; /* milliseconds */ 155 Time time; /* milliseconds */
113 unsigned int state; /* key or button mask */ 156 unsigned int state; /* key or button mask */
114 unsigned int button; /* detail */ 157 unsigned int button; /* detail */
115}; 158};
116
117#ifndef min
118# define min(a,b) (((a) < (b)) ? (a) : (b))
119# define max(a,b) (((a) > (b)) ? (a) : (b))
120#endif
121 159
122#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 160#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
123#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 161#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
124#define SWAP_IT(one, two, typeof) \ 162#define SWAP_IT(one, two, typeof) \
125 do { \ 163 do { \
… …
129#define BOUND_POSITIVE_INT16(val) \ 167#define BOUND_POSITIVE_INT16(val) \
130 (int16_t) ((val) <= 0 \ 168 (int16_t) ((val) <= 0 \
131 ? 0 \ 169 ? 0 \
132 : min ((val), (((uint16_t)-1)>>1))) 170 : min ((val), (((uint16_t)-1)>>1)))
133 171
172#if ENABLE_FRILLS
173typedef struct _mwmhints {
174 CARD32 flags;
175 CARD32 functions;
176 CARD32 decorations;
177 INT32 input_mode;
178 CARD32 status;
179} MWMHints;
180#endif
181
134/* 182/*
135 ***************************************************************************** 183 *****************************************************************************
136 * NORMAL DEFINES 184 * NORMAL DEFINES
137 ***************************************************************************** 185 *****************************************************************************
138 */ 186 */
… …
143# define COLORTERMENVFULL COLORTERMENV "-xpm" 191# define COLORTERMENVFULL COLORTERMENV "-xpm"
144#else 192#else
145# define COLORTERMENVFULL COLORTERMENV 193# define COLORTERMENVFULL COLORTERMENV
146#endif 194#endif
147#ifndef TERMENV 195#ifndef TERMENV
148# define TERMENV "rxvt" 196# define TERMENV "rxvt-unicode"
149#endif 197#endif
150 198
151#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 199#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
152# define NO_MOUSE_REPORT_SCROLLBAR 200# define NO_MOUSE_REPORT_SCROLLBAR 1
153#endif 201#endif
154 202
155#ifdef NO_RESOURCES 203#ifdef NO_RESOURCES
156# undef USE_XGETDEFAULT 204# undef USE_XGETDEFAULT
205#endif
206
207#if ISO_14755
208# define ENABLE_OVERLAY 1
157#endif 209#endif
158 210
159/* now look for other badly set stuff */ 211/* now look for other badly set stuff */
160 212
161#if !defined (EACCESS) && defined(EAGAIN) 213#if !defined (EACCESS) && defined(EAGAIN)
… …
170#define menuBar_esc 10 222#define menuBar_esc 10
171#define scrollBar_esc 30 223#define scrollBar_esc 30
172#define menuBar_margin 2 /* margin below text */ 224#define menuBar_margin 2 /* margin below text */
173 225
174#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 226#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
175# define HAVE_SCROLLBARS 227# define HAVE_SCROLLBARS 1
176#endif 228#endif
177 229
178/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 230/* width of scrollBar, menuBar shadow, must be 1 or 2 */
179#ifdef HALFSHADOW 231#ifdef HALFSHADOW
180# define SHADOW 1 232# define SHADOW 1
… …
264enum { 316enum {
265 NO_REFRESH = 0 , /* Window not visible at all! */ 317 NO_REFRESH = 0 , /* Window not visible at all! */
266 FAST_REFRESH = 1<<0, /* Fully exposed window */ 318 FAST_REFRESH = 1<<0, /* Fully exposed window */
267 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 319 SLOW_REFRESH = 1<<1, /* Partially exposed window */
268 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */ 320 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
269 REFRESH_BOUNDS = 1<<3
270}; 321};
271 322
272#ifdef NO_SECONDARY_SCREEN 323#ifdef NO_SECONDARY_SCREEN
273# define NSCREENS 0 324# define NSCREENS 0
274#else 325#else
275# define NSCREENS 1 326# define NSCREENS 1
276#endif 327#endif
277
278#define IGNORE 0
279#define SAVE 's'
280#define RESTORE 'r'
281 328
282/* special (internal) prefix for font commands */ 329/* special (internal) prefix for font commands */
283#define FONT_CMD '#' 330#define FONT_CMD '#'
284#define FONT_DN "#-" 331#define FONT_DN "#-"
285#define FONT_UP "#+" 332#define FONT_UP "#+"
… …
311 SECONDARY, 358 SECONDARY,
312}; 359};
313 360
314#define RS_None 0 /* Normal */ 361#define RS_None 0 /* Normal */
315 362
316#define RS_fgMask 0x000001FFu /* 512 colors */ 363#define RS_fgMask 0x0000007fUL /* 128 colors */
317#define RS_bgMask 0x0003FE00u /* 512 colors */ 364#define RS_bgMask 0x00003f80UL /* 128 colors */
318#define RS_Bold 0x00040000u /* bold */ 365
366// font styles
367#define RS_Bold 0x00004000UL // value 1
368#define RS_Italic 0x00008000UL // value 2
369
370// fake styles
319#define RS_Blink 0x00080000u /* blink */ 371#define RS_Blink 0x00010000UL /* blink */
320#define RS_RVid 0x00100000u /* reverse video */ 372#define RS_RVid 0x00020000UL /* reverse video */
321#define RS_Uline 0x00200000u /* underline */ 373#define RS_Uline 0x00040000UL /* underline */
322 374
323#define RS_fontMask 0xffc00000u /* plenty(?) of fonts */ 375// 5 bits still to go
324#define RS_fontShift 22
325 376
377// other flags
378#define RS_Careful 0x80000000UL /* be careful when drawing these */
379
380#define RS_styleCount 4
381#define RS_styleMask (RS_Bold | RS_Italic)
382#define RS_styleShift 14
383
326#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 384#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
327#define RS_attrMask (RS_baseattrMask|RS_fontMask) 385#define RS_attrMask (RS_baseattrMask | RS_fontMask)
386
387#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
388#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
389#define RS_fontShift 24
390
391#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
392#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
328 393
329#define Sel_none 0 /* Not waiting */ 394#define Sel_none 0 /* Not waiting */
330#define Sel_normal 0x01 /* normal selection */ 395#define Sel_normal 0x01 /* normal selection */
331#define Sel_incr 0x02 /* incremental selection */ 396#define Sel_incr 0x02 /* incremental selection */
332#define Sel_direct 0x00 397#define Sel_direct 0x00
… …
352 */ 417 */
353enum { 418enum {
354 XTerm_name = 0, 419 XTerm_name = 0,
355 XTerm_iconName = 1, 420 XTerm_iconName = 1,
356 XTerm_title = 2, 421 XTerm_title = 2,
357 XTerm_property = 3, // change X property, not yet implemented 422 XTerm_property = 3, // change X property
358 XTerm_Color = 4, // change colors 423 XTerm_Color = 4, // change colors
359 XTerm_Color00 = 10, // not implemented, CLASH! 424 XTerm_Color00 = 10, // not implemented, CLASH!
360 XTerm_Color01 = 11, // not implemented 425 XTerm_Color01 = 11, // not implemented
361 XTerm_Color_cursor = 12, // change actual 'Cursor' color 426 XTerm_Color_cursor = 12, // change actual 'Cursor' color
362 XTerm_Color_pointer = 13, // change actual 'Pointer' color 427 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color
363 XTerm_Color04 = 14, // not implemented 428 XTerm_Color_pointer_bg = 14, // not implemented
364 XTerm_Color05 = 15, // not implemented 429 XTerm_Color05 = 15, // not implemented
365 XTerm_Color06 = 16, // not implemented 430 XTerm_Color06 = 16, // not implemented
366 XTerm_Color_RV = 17, // change actual 'Highlight' color 431 XTerm_Color_RV = 17, // change actual 'Highlight' color
367 XTerm_logfile = 46, // not implemented 432 XTerm_logfile = 46, // not implemented
368 XTerm_font = 50, 433 XTerm_font = 50,
… …
371 XTerm_konsole31 = 31, // reserved for konsole 436 XTerm_konsole31 = 31, // reserved for konsole
372 XTerm_emacs51 = 51, // reserved for emacs shell 437 XTerm_emacs51 = 51, // reserved for emacs shell
373 /* 438 /*
374 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 439 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
375 */ 440 */
376 XTerm_Menu = 10, // set menu item
377 XTerm_Color_BD = 18, // change actual 'Bold' color 441 XTerm_Color_BD = 18, // change actual 'Bold' color
378 XTerm_Color_UL = 19, // change actual 'Underline' color 442 XTerm_Color_UL = 19, // change actual 'Underline' color
379 XTerm_Pixmap = 20, // new bg pixmap 443 XTerm_Pixmap = 20, // new bg pixmap
380 XTerm_restoreFG = 39, // change default fg color 444 XTerm_restoreFG = 39, // change default fg color
381 XTerm_restoreBG = 49, // change default bg color 445 XTerm_restoreBG = 49, // change default bg color
382 XTerm_dumpscreen = 55, // dump scrollback and all of screen 446 XTerm_dumpscreen = 55, // dump scrollback and all of screen
383 XTerm_locale = 701, // change locale 447 XTerm_locale = 701, // change locale
384 XTerm_findfont = 702, // find font of given character (in decimal) 448 XTerm_Menu = 703, // set menu item
449 XTerm_Color_IT = 704, // change actual 'Italic' colour
450 XTerm_Color_tint = 705, // change actual tint colour
451
452 URxvt_font = 710,
453 URxvt_boldFont = 711,
454 URxvt_italicFont = 712,
455 URxvt_boldItalicFont = 713,
385}; 456};
386 457
387/* Words starting with `Color_' are colours. Others are counts */ 458/* Words starting with `Color_' are colours. Others are counts */
388/* 459/*
389 * The following comment is mostly obsolete since pixcolor_set was expanded: 460 * The following comment is mostly obsolete since pixcolor_set was expanded:
… …
418 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 489 maxBrightCOLOR, /* minBrightCOLOR + 7 */
419 Color_White = maxBrightCOLOR, 490 Color_White = maxBrightCOLOR,
420#else 491#else
421 Color_White = maxCOLOR, 492 Color_White = maxCOLOR,
422#endif 493#endif
423#ifdef TTY_256COLOR
424 min256COLOR = Color_White + 1, 494 minTermCOLOR = Color_White + 1,
425 max256COLOR = minCOLOR + 255, 495 maxTermCOLOR = Color_White + 72,
426#endif
427#ifndef NO_CURSORCOLOR 496#ifndef NO_CURSORCOLOR
428 Color_cursor, 497 Color_cursor,
429 Color_cursor2, 498 Color_cursor2,
430#endif 499#endif
431 Color_pointer, 500 Color_pointer_fg,
501 Color_pointer_bg,
432 Color_border, 502 Color_border,
433#ifndef NO_BOLD_UNDERLINE_REVERSE 503#ifndef NO_BOLD_UNDERLINE_REVERSE
434 Color_BD, 504 Color_BD,
505 Color_IT,
435 Color_UL, 506 Color_UL,
436 Color_RV, 507 Color_RV,
508#endif
509#if ENABLE_FRILLS
510 Color_underline,
437#endif 511#endif
438#ifdef OPTION_HC 512#ifdef OPTION_HC
439 Color_HC, 513 Color_HC,
440#endif 514#endif
441#ifdef KEEP_SCROLLCOLOR 515#ifdef KEEP_SCROLLCOLOR
442 Color_scroll, 516 Color_scroll,
443 Color_trough, 517 Color_trough,
518#endif
519#if TINTING
520 Color_tint,
444#endif 521#endif
445 NRS_COLORS, /* */ 522 NRS_COLORS, /* */
446#ifdef KEEP_SCROLLCOLOR 523#ifdef KEEP_SCROLLCOLOR
447 Color_topShadow = NRS_COLORS, 524 Color_topShadow = NRS_COLORS,
448 Color_bottomShadow, 525 Color_bottomShadow,
449 TOTAL_COLORS /* upto 30 */ 526 TOTAL_COLORS
450#else 527#else
451 TOTAL_COLORS = NRS_COLORS /* */ 528 TOTAL_COLORS = NRS_COLORS
452#endif 529#endif
453}; 530};
454 531
455#define Color_Bits 9 532#define Color_Bits 7 // 0 .. maxTermCOLOR
533
456#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 534#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
457#define NPIXCLR_BITS 32 535#define NPIXCLR_BITS 32
458
459#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
460 536
461/* 537/*
462 * Resource list 538 * Resource list
463 */ 539 */
464enum { 540enum {
… …
468 Rs_geometry, 544 Rs_geometry,
469 Rs_reverseVideo, 545 Rs_reverseVideo,
470 Rs_color, 546 Rs_color,
471 _Rs_color = Rs_color + NRS_COLORS - 1, 547 _Rs_color = Rs_color + NRS_COLORS - 1,
472 Rs_font, 548 Rs_font,
549#if ENABLE_STYLES
550 Rs_boldFont,
551 Rs_italicFont,
552 Rs_boldItalicFont,
553#endif
473 Rs_name, 554 Rs_name,
474 Rs_title, 555 Rs_title,
475#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 556#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
476 Rs_path, 557 Rs_path,
477#endif 558#endif
… …
486#ifdef HAVE_SCROLLBARS 567#ifdef HAVE_SCROLLBARS
487 Rs_scrollBar, 568 Rs_scrollBar,
488 Rs_scrollBar_right, 569 Rs_scrollBar_right,
489 Rs_scrollBar_floating, 570 Rs_scrollBar_floating,
490 Rs_scrollBar_align, 571 Rs_scrollBar_align,
491#endif
492 Rs_scrollstyle, /* Rs_scrollBar_style */ 572 Rs_scrollstyle, /* Rs_scrollBar_style */
573 Rs_scrollBar_thickness,
574#endif
493 Rs_scrollTtyOutput, 575 Rs_scrollTtyOutput,
494 Rs_scrollTtyKeypress, 576 Rs_scrollTtyKeypress,
495 Rs_scrollWithBuffer, 577 Rs_scrollWithBuffer,
496 Rs_saveLines, 578 Rs_saveLines,
497 Rs_utmpInhibit, 579 Rs_utmpInhibit,
… …
521#endif 603#endif
522#ifdef TRANSPARENT 604#ifdef TRANSPARENT
523 Rs_transparent, 605 Rs_transparent,
524 Rs_transparent_all, 606 Rs_transparent_all,
525#endif 607#endif
526#ifndef NO_FRILLS 608#if ENABLE_FRILLS
527 Rs_ext_bwidth, 609 Rs_ext_bwidth,
528 Rs_int_bwidth, 610 Rs_int_bwidth,
529#endif 611 Rs_borderLess,
530 Rs_scrollBar_thickness,
531#ifndef NO_LINESPACE
532 Rs_lineSpace, 612 Rs_lineSpace,
613 Rs_embed,
614 Rs_pty_fd,
533#endif 615#endif
534 Rs_cutchars, 616 Rs_cutchars,
535 Rs_modifier, 617 Rs_modifier,
536 Rs_answerbackstring, 618 Rs_answerbackstring,
537 Rs_tripleclickwords, 619 Rs_tripleclickwords,
620 Rs_insecure,
538 Rs_cursorBlink, 621 Rs_cursorBlink,
539 Rs_pointerBlank, 622 Rs_pointerBlank,
540 Rs_pointerBlankDelay, 623 Rs_pointerBlankDelay,
541 Rs_imLocale, 624 Rs_imLocale,
625 Rs_imFont,
626 Rs_pastableTabs,
627#ifndef NO_SECONDARY_SCREEN
628 Rs_secondaryScreen,
629 Rs_secondaryScroll,
630#endif
631#ifdef OFF_FOCUS_FADING
632 Rs_fade,
633#endif
634#ifdef TINTING
635 Rs_shade,
636#endif
542 NUM_RESOURCES 637 NUM_RESOURCES
543}; 638};
544 639
545// see init.C:xa_names, which must be kept in sync 640// see init.C:xa_names, which must be kept in sync
546enum { 641enum {
… …
551 XA_TARGETS, 646 XA_TARGETS,
552 XA_TIMESTAMP, 647 XA_TIMESTAMP,
553 XA_VT_SELECTION, 648 XA_VT_SELECTION,
554 XA_INCR, 649 XA_INCR,
555 XA_WMDELETEWINDOW, 650 XA_WMDELETEWINDOW,
651 XA_CLIPBOARD,
652#if ENABLE_FRILLS
653 XA_NET_WM_PID,
654 XA_MOTIF_WM_HINTS,
655 XA_NET_WM_NAME,
656 XA_NET_WM_ICON_NAME,
657#endif
658#if USE_XIM
659 XA_WM_LOCALE_NAME,
660#endif
556#ifdef TRANSPARENT 661#if TRANSPARENT
557 XA_XROOTPMAPID, 662 XA_XROOTPMAP_ID,
663 XA_ESETROOT_PMAP_ID,
558#endif 664#endif
559#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 665#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
560 XA_DNDPROTOCOL, 666 XA_DNDPROTOCOL,
561 XA_DNDSELECTION, 667 XA_DNDSELECTION,
562#endif /* OFFIX_DND */ 668#endif
563 XA_CLIPBOARD,
564 NUM_XA 669 NUM_XA
565}; 670};
566 671
567/* DEC private modes */ 672/* DEC private modes */
568#define PrivMode_132 (1LU<<0) 673#define PrivMode_132 (1UL<<0)
569#define PrivMode_132OK (1LU<<1) 674#define PrivMode_132OK (1UL<<1)
570#define PrivMode_rVideo (1LU<<2) 675#define PrivMode_rVideo (1UL<<2)
571#define PrivMode_relOrigin (1LU<<3) 676#define PrivMode_relOrigin (1UL<<3)
572#define PrivMode_Screen (1LU<<4) 677#define PrivMode_Screen (1UL<<4)
573#define PrivMode_Autowrap (1LU<<5) 678#define PrivMode_Autowrap (1UL<<5)
574#define PrivMode_aplCUR (1LU<<6) 679#define PrivMode_aplCUR (1UL<<6)
575#define PrivMode_aplKP (1LU<<7) 680#define PrivMode_aplKP (1UL<<7)
576#define PrivMode_HaveBackSpace (1LU<<8) 681#define PrivMode_HaveBackSpace (1UL<<8)
577#define PrivMode_BackSpace (1LU<<9) 682#define PrivMode_BackSpace (1UL<<9)
578#define PrivMode_ShiftKeys (1LU<<10) 683#define PrivMode_ShiftKeys (1UL<<10)
579#define PrivMode_VisibleCursor (1LU<<11) 684#define PrivMode_VisibleCursor (1UL<<11)
580#define PrivMode_MouseX10 (1LU<<12) 685#define PrivMode_MouseX10 (1UL<<12)
581#define PrivMode_MouseX11 (1LU<<13) 686#define PrivMode_MouseX11 (1UL<<13)
582#define PrivMode_scrollBar (1LU<<14) 687#define PrivMode_scrollBar (1UL<<14)
583#define PrivMode_menuBar (1LU<<15) 688#define PrivMode_menuBar (1UL<<15)
584#define PrivMode_TtyOutputInh (1LU<<16) 689#define PrivMode_TtyOutputInh (1UL<<16)
585#define PrivMode_Keypress (1LU<<17) 690#define PrivMode_Keypress (1UL<<17)
586#define PrivMode_smoothScroll (1LU<<18) 691#define PrivMode_smoothScroll (1UL<<18)
587#define PrivMode_vt52 (1LU<<19) 692#define PrivMode_vt52 (1UL<<19)
693#define PrivMode_LFNL (1UL<<20)
588/* too annoying to implement X11 highlight tracking */ 694/* too annoying to implement X11 highlight tracking */
589/* #define PrivMode_MouseX11Track (1LU<<20) */ 695/* #define PrivMode_MouseX11Track (1LU<<21) */
590 696
591#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 697#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
592#define PrivMode(test,bit) \ 698#define PrivMode(test,bit) \
593 if (test) \ 699 if (test) \
594 PrivateModes |= (bit); \ 700 priv_modes |= (bit); \
595 else \ 701 else \
596 PrivateModes &= ~(bit) 702 priv_modes &= ~(bit)
597 703
598#ifdef ALLOW_132_MODE 704#ifdef ALLOW_132_MODE
599# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 705# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
600#else 706#else
601# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 707# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
602#endif 708#endif
603 709
604#define XDEPTH display->depth 710// do not change these constants lightly, there are many interdependencies
605#define XCMAP display->cmap
606#define XVISUAL display->visual
607
608#define IMBUFSIZ 128 // input modifier buffer sizes 711#define IMBUFSIZ 128 // input modifier buffer sizes
609#define KBUFSZ 512 // size of keyboard mapping buffer 712#define KBUFSZ 512 // size of keyboard mapping buffer
610#define CBUFSIZ 4096 // size of command buffer 713#define CBUFSIZ 4096 // size of command buffer
611#define UBUFSIZ 4096 // character buffer 714#define UBUFSIZ 4096 // character buffer
715
716#ifndef PATH_MAX
717# define PATH_MAX 16384
718#endif
719
720/* Motif window hints */
721#define MWM_HINTS_FUNCTIONS (1L << 0)
722#define MWM_HINTS_DECORATIONS (1L << 1)
723#define MWM_HINTS_INPUT_MODE (1L << 2)
724#define MWM_HINTS_STATUS (1L << 3)
725/* bit definitions for MwmHints.functions */
726#define MWM_FUNC_ALL (1L << 0)
727#define MWM_FUNC_RESIZE (1L << 1)
728#define MWM_FUNC_MOVE (1L << 2)
729#define MWM_FUNC_MINIMIZE (1L << 3)
730#define MWM_FUNC_MAXIMIZE (1L << 4)
731#define MWM_FUNC_CLOSE (1L << 5)
732/* bit definitions for MwmHints.decorations */
733#define MWM_DECOR_ALL (1L << 0)
734#define MWM_DECOR_BORDER (1L << 1)
735#define MWM_DECOR_RESIZEH (1L << 2)
736#define MWM_DECOR_TITLE (1L << 3)
737#define MWM_DECOR_MENU (1L << 4)
738#define MWM_DECOR_MINIMIZE (1L << 5)
739#define MWM_DECOR_MAXIMIZE (1L << 6)
740/* bit definitions for MwmHints.inputMode */
741#define MWM_INPUT_MODELESS 0
742#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
743#define MWM_INPUT_SYSTEM_MODAL 2
744#define MWM_INPUT_FULL_APPLICATION_MODAL 3
745#define PROP_MWM_HINTS_ELEMENTS 5
612 746
613/* 747/*
614 ***************************************************************************** 748 *****************************************************************************
615 * MACRO DEFINES 749 * MACRO DEFINES
616 ***************************************************************************** 750 *****************************************************************************
617 */ 751 */
618#define MEMSET(x, y, z) memset((x), (y), (size_t)(z)) 752#define memset(x, y, z) memset((x), (y), (size_t)(z))
619#define MEMCPY(x, y, z) memcpy((void *)(x), (const void *)(y), (z)) 753#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
620#define MEMMOVE(x, y, z) memmove((void *)(x), (const void *)(y), (z)) 754#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
621#define STRCASECMP(x, y) strcasecmp((x), (y)) 755#define strcasecmp(x, y) strcasecmp((x), (y))
622#define STRNCASECMP(x, y, z) strncasecmp((x), (y), (z)) 756#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
623#define STRCPY(x, y) strcpy((char *)(x), (const char *)(y)) 757#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
624#define STRNCPY(x, y, z) strncpy((char *)(x), (const char *)(y), (z)) 758#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
625#define STRCMP(x, y) strcmp((const char *)(x), (const char *)(y)) 759#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
626#define STRNCMP(x, y, z) strncmp((const char *)(x), (const char *)(y), (z)) 760#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
627#define STRCAT(x, y) strcat((char *)(x), (const char *)(y)) 761#define strcat(x, y) strcat((char *)(x), (const char *)(y))
628#define STRNCAT(x, y, z) strncat((char *)(x), (const char *)(y), (z)) 762#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
629#define STRDUP(x) strdup((const char *)(x)) 763#define strdup(x) strdup((const char *)(x))
630#define STRLEN(x) strlen((const char *)(x)) 764#define strlen(x) strlen((const char *)(x))
631#define STRCHR(x, y) strchr((const char *)(x), (int)(y)) 765#define strchr(x, y) strchr((const char *)(x), (int)(y))
632#define STRRCHR(x, y) strrchr((const char *)(x), (int)(y)) 766#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
767
768#define dDisp Display *disp = display->display
633 769
634/* convert pixel dimensions to row/column values. Everything as int32_t */ 770/* convert pixel dimensions to row/column values. Everything as int32_t */
635#define Pixel2Col(x) Pixel2Width((int32_t)(x) - (int32_t)TermWin.int_bwidth) 771#define Pixel2Col(x) Pixel2Width((int32_t)(x))
636#define Pixel2Row(y) Pixel2Height((int32_t)(y) - (int32_t)TermWin.int_bwidth) 772#define Pixel2Row(y) Pixel2Height((int32_t)(y))
637#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 773#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
638#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 774#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
639#define Col2Pixel(col) ((int32_t)Width2Pixel(col) + (int32_t)TermWin.int_bwidth) 775#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
640#define Row2Pixel(row) ((int32_t)Height2Pixel(row) + (int32_t)TermWin.int_bwidth) 776#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
641#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 777#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth)
642#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 778#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
643 779
644#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 780#define TermWin_TotalWidth() ((int32_t)TermWin.width)
645#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) 781#define TermWin_TotalHeight() ((int32_t)TermWin.height)
646 782
647/* how to build & extract colors and attributes */ 783/* how to build & extract colors and attributes */
648#define GET_BASEFG(x) (((x) & RS_fgMask)) 784#define GET_BASEFG(x) (((x) & RS_fgMask))
649#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 785#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
650#ifndef NO_BRIGHTCOLOR 786#ifndef NO_BRIGHTCOLOR
… …
664# define GET_FGCOLOR(x) GET_BASEFG(x) 800# define GET_FGCOLOR(x) GET_BASEFG(x)
665# define GET_BGCOLOR(x) GET_BASEBG(x) 801# define GET_BGCOLOR(x) GET_BASEBG(x)
666#endif 802#endif
667 803
668#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 804#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
669#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 805#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
806
807#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
808#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
670 809
671#define GET_ATTR(x) (((x) & RS_attrMask)) 810#define GET_ATTR(x) (((x) & RS_attrMask))
672#define GET_BGATTR(x) \ 811#define GET_BGATTR(x) \
673 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 812 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
674 | (((x) & RS_fgMask)<<Color_Bits)) \ 813 | (((x) & RS_fgMask)<<Color_Bits)) \
675 : ((x) & (RS_attrMask | RS_bgMask))) 814 : ((x) & (RS_attrMask | RS_bgMask)))
676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 815#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 816#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
678#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 817#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
818
819#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
679 820
680#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 821#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
681#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 822#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
823
824#if ENABLE_STYLES
825# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]
826#else
827# define FONTSET(style) TermWin.fontset[0]
828#endif
682 829
683#ifdef HAVE_SCROLLBARS 830#ifdef HAVE_SCROLLBARS
684# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 831# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
685#else 832#else
686# define scrollbar_TotalWidth() (0) 833# define scrollbar_TotalWidth() (0)
… …
725# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 872# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
726#else 873#else
727# define XPMClearArea(a, b, c, d, e, f, g) 874# define XPMClearArea(a, b, c, d, e, f, g)
728#endif 875#endif
729 876
730#ifndef STRICT_FONT_CHECKING
731# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
732#endif
733
734#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
735#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
736
737#ifdef UTMP_SUPPORT 877#ifdef UTMP_SUPPORT
738# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
739# undef HAVE_UTMPX_H 879# undef HAVE_UTMPX_H
740# undef HAVE_STRUCT_UTMPX 880# undef HAVE_STRUCT_UTMPX
741# endif 881# endif
… …
765#ifdef DEBUG_MAIN 905#ifdef DEBUG_MAIN
766# define D_MAIN(x) fprintf x ; fputc('\n', stderr) 906# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
767#else 907#else
768# define D_MAIN(x) 908# define D_MAIN(x)
769#endif 909#endif
770#ifdef DEBUG_SCREEN
771# define D_SCREEN(x) fprintf x ; fputc('\n', stderr)
772#else
773# define D_SCREEN(x)
774#endif
775#ifdef DEBUG_SELECT
776# define D_SELECT(x) fprintf x ; fputc('\n', stderr)
777#else
778# define D_SELECT(x)
779#endif
780#ifdef DEBUG_SIZE 910#ifdef DEBUG_SIZE
781# define D_SIZE(x) fprintf x ; fputc('\n', stderr) 911# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
782#else 912#else
783# define D_SIZE(x) 913# define D_SIZE(x)
784#endif
785#ifdef DEBUG_X
786# define D_X(x) fprintf x ; fputc('\n', stderr)
787#else
788# define D_X(x)
789#endif 914#endif
790 915
791extern class rxvt_failure_exception { } rxvt_failure_exception; 916extern class rxvt_failure_exception { } rxvt_failure_exception;
792 917
793typedef callback1<void, const char *> log_callback; 918typedef callback1<void, const char *> log_callback;
… …
797extern void rxvt_warn (const char *fmt, ...); 922extern void rxvt_warn (const char *fmt, ...);
798extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 923extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
799extern void rxvt_exit_failure () __attribute__ ((noreturn)); 924extern void rxvt_exit_failure () __attribute__ ((noreturn));
800 925
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 926#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern void rxvt_set_locale (const char *locale); 927extern bool rxvt_set_locale (const char *locale);
803 928
804/* 929/*
805 ***************************************************************************** 930 *****************************************************************************
806 * VARIABLES 931 * VARIABLES
807 ***************************************************************************** 932 *****************************************************************************
… …
825// primivite wrapper around mbstate_t to ensure initialisation 950// primivite wrapper around mbstate_t to ensure initialisation
826struct mbstate { 951struct mbstate {
827 mbstate_t mbs; 952 mbstate_t mbs;
828 953
829 operator mbstate_t *() { return &mbs; } 954 operator mbstate_t *() { return &mbs; }
830 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); } 955 void reset () { memset (&mbs, 0, sizeof (mbs)); }
831 mbstate () { reset (); } 956 mbstate () { reset (); }
832}; 957};
958
959#define UNICODE_MASK 0x1fffffUL
833 960
834#if UNICODE3 961#if UNICODE3
835# define COMPOSE_LO 0x40000000UL 962# define COMPOSE_LO 0x40000000UL
836# define COMPOSE_HI 0x400fffffUL 963# define COMPOSE_HI 0x400fffffUL
837# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 964# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
867 994
868extern class rxvt_composite_vec rxvt_composite; 995extern class rxvt_composite_vec rxvt_composite;
869#endif 996#endif
870 997
871 998
999#ifdef KEYSYM_RESOURCE
1000 class keyboard_manager;
1001#endif
1002
872struct rxvt_term : rxvt_vars { 1003struct rxvt_term : zero_initialized, rxvt_vars {
873 log_callback *log_hook; 1004 log_callback *log_hook; // log error messages through this hook, if != 0
874 1005
875 struct mbstate mbstate; 1006 struct mbstate mbstate; // current input multibyte state
876 1007
877 unsigned char want_refresh:1, 1008 unsigned char want_refresh:1,
878#ifdef TRANSPARENT 1009#ifdef TRANSPARENT
879 want_full_refresh:1, /* awaiting full screen refresh */ 1010 want_full_refresh:1, /* awaiting full screen refresh */
880#endif 1011#endif
… …
893 hidden_text:1, 1024 hidden_text:1,
894#endif 1025#endif
895#ifdef POINTER_BLANK 1026#ifdef POINTER_BLANK
896 hidden_pointer:1, 1027 hidden_pointer:1,
897#endif 1028#endif
1029 enc_utf8:1, /* wether locale uses utf-8 */
1030 seen_input:1, /* wether we have seen some program output yet */
1031 seen_resize:1, /* wether we had a resize event */
898 parsed_geometry:1, 1032 parsed_geometry:1;
899// enc_utf8:1, /* wether terminal reads/writes utf-8 */
900 seen_input:1; /* wether any input has been seen so far */
901 1033
902 unsigned char refresh_type, 1034 unsigned char refresh_type,
903#ifdef UTMP_SUPPORT
904 next_utmp_action,
905#endif
906#ifndef NO_SETOWNER_TTYDEV
907 next_tty_action,
908#endif
909#ifdef META8_OPTION 1035#ifdef META8_OPTION
910 meta_char, /* Alt-key prefix */ 1036 meta_char, /* Alt-key prefix */
911#endif 1037#endif
912 scrollbar_align, 1038 scrollbar_align,
913 selection_wait, 1039 selection_wait,
914 selection_type; 1040 selection_type;
915/* ---------- */ 1041/* ---------- */
916 short rvideo; 1042 short rvideo;
917 int16_t num_scr; /* screen: number lines scrolled */ 1043 int num_scr; /* screen: number lines scrolled */
918 unsigned int prev_ncol, /* screen: previous number of columns */ 1044 int prev_ncol, /* screen: previous number of columns */
919 prev_nrow; /* screen: previous number of rows */ 1045 prev_nrow; /* screen: previous number of rows */
920/* ---------- */ 1046/* ---------- */
921 rend_t rstyle; 1047 rend_t rstyle;
922/* ---------- */ 1048/* ---------- */
923 uint32_t pixcolor_set[NPIXCLR_SETS]; 1049 uint32_t pixcolor_set[NPIXCLR_SETS];
924/* ---------- */ 1050/* ---------- */
925#ifdef SELECTION_SCROLLING 1051#ifdef SELECTION_SCROLLING
926 int scroll_selection_delay,
927 scroll_selection_lines; 1052 int scroll_selection_lines;
928 enum page_dirn scroll_selection_dir; 1053 enum page_dirn scroll_selection_dir;
929 int selection_save_x, 1054 int selection_save_x,
930 selection_save_y, 1055 selection_save_y,
931 selection_save_state, 1056 selection_save_state;
932 pending_scroll_selection;
933#endif 1057#endif
934/* ---------- */ 1058/* ---------- */
935 int csrO, /* Hops - csr offset in thumb/slider to */ 1059 int csrO, /* Hops - csr offset in thumb/slider to */
936 /* give proper Scroll behaviour */ 1060 /* give proper Scroll behaviour */
937#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
938 scroll_arrow_delay,
939#endif
940#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1061#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
941 mouse_slip_wheel_delay,
942 mouse_slip_wheel_speed, 1062 mouse_slip_wheel_speed,
943#endif 1063#endif
944 refresh_count, 1064 refresh_count,
945 refresh_limit, 1065 refresh_limit,
946 fnum, /* logical font number */
947 last_bot, /* scrollbar last bottom position */ 1066 last_bot, /* scrollbar last bottom position */
948 last_top, /* scrollbar last top position */ 1067 last_top, /* scrollbar last top position */
949 last_state, /* scrollbar last state */ 1068 last_state, /* scrollbar last state */
950 scrollbar_len, 1069 scrollbar_len,
951#ifdef MENUBAR 1070#ifdef MENUBAR
… …
961# ifdef POINTER_BLANK 1080# ifdef POINTER_BLANK
962 pointerBlankDelay, 1081 pointerBlankDelay,
963# endif 1082# endif
964 allowedxerror; 1083 allowedxerror;
965/* ---------- */ 1084/* ---------- */
966 unsigned int ModMetaMask, 1085 unsigned int ModLevel3Mask,
1086 ModMetaMask,
967 ModNumLockMask, 1087 ModNumLockMask;
968 old_width, /* last used width in screen resize */ 1088 int old_width, /* last used width in screen resize */
969 old_height, /* last used height in screen resize */ 1089 old_height; /* last used height in screen resize */
970#ifndef NO_BRIGHTCOLOR
971 colorfgbg,
972#endif
973 ttymode;
974 unsigned long PrivateModes, 1090 unsigned long priv_modes,
975 SavedModes; 1091 SavedModes;
976/* ---------- */ 1092/* ---------- */
977 Atom xa[NUM_XA]; 1093 Atom xa[NUM_XA];
978/* ---------- */ 1094/* ---------- */
979#ifdef MENUBAR 1095#ifdef MENUBAR
… …
1005#endif 1121#endif
1006/* ---------- */ 1122/* ---------- */
1007 Time selection_time, 1123 Time selection_time,
1008 selection_request_time; 1124 selection_request_time;
1009 pid_t cmd_pid; /* process id of child */ 1125 pid_t cmd_pid; /* process id of child */
1010 gid_t ttygid; 1126 char * incr_buf;
1011#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 1127 size_t incr_buf_size, incr_buf_fill;
1012 uid_t euid;
1013 gid_t egid;
1014#endif
1015/* ---------- */ 1128/* ---------- */
1016 Cursor leftptr_cursor; 1129 Cursor leftptr_cursor;
1017#ifdef POINTER_BLANK
1018 Cursor blank_cursor;
1019#endif
1020/* ---------- */ 1130/* ---------- */
1021 const char *ttydev; /* pty/tty name */
1022#ifndef NO_BACKSPACE_KEY 1131#ifndef NO_BACKSPACE_KEY
1023 const char *key_backspace; 1132 const char *key_backspace;
1024#endif 1133#endif
1025#ifndef NO_DELETE_KEY 1134#ifndef NO_DELETE_KEY
1026 const char *key_delete; 1135 const char *key_delete;
1027#endif
1028#ifdef USE_XIM
1029 rxvt_xim *input_method;
1030 XIC Input_Context;
1031 XIMStyle input_style;
1032 int event_type;
1033#endif 1136#endif
1034 struct mouse_event MEvent; 1137 struct mouse_event MEvent;
1035 XComposeStatus compose; 1138 XComposeStatus compose;
1036 ttymode_t tio; 1139 ttymode_t tio;
1037#ifdef UTMP_SUPPORT 1140#ifdef UTMP_SUPPORT
… …
1049 row_col_t oldcursor; 1152 row_col_t oldcursor;
1050#ifdef XPM_BACKGROUND 1153#ifdef XPM_BACKGROUND
1051 bgPixmap_t bgPixmap; 1154 bgPixmap_t bgPixmap;
1052 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1155 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1053#endif 1156#endif
1054#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1055 struct stat ttyfd_stat; /* original status of our tty */
1056#endif
1057#ifdef MENUBAR 1157#ifdef MENUBAR
1058 menu_t *ActiveMenu, /* currently active menu */ 1158 menu_t *ActiveMenu, /* currently active menu */
1059 *BuildMenu; /* the menu currently being built */ 1159 *BuildMenu; /* the menu currently being built */
1060 bar_t *CurrentBar; 1160 bar_t *CurrentBar;
1061# if ! (MENUBAR_MAX > 1) 1161# if ! (MENUBAR_MAX > 1)
… …
1067#endif 1167#endif
1068#ifdef POINTER_BLANK 1168#ifdef POINTER_BLANK
1069 struct timeval lastmotion; 1169 struct timeval lastmotion;
1070#endif 1170#endif
1071 1171
1172#if ENABLE_OVERLAY
1173 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1174 text_t **ov_text;
1175 rend_t **ov_rend;
1176
1177 void scr_swap_overlay ();
1178 void scr_overlay_new (int x, int y, int w, int h);
1179 void scr_overlay_off ();
1180 void scr_overlay_set (int x, int y,
1181 text_t text,
1182 rend_t rend = OVERLAY_RSTYLE);
1183 void scr_overlay_set (int x, int y, const char *s);
1184#endif
1185
1072 vector<void *> allocated; // free these memory blocks 1186 vector<void *> allocated; // free these memory blocks with free()
1073 1187
1074 char *env_windowid; /* environmental variable WINDOWID */ 1188 char *env_windowid; /* environmental variable WINDOWID */
1075 char *env_display; /* environmental variable DISPLAY */ 1189 char *env_display; /* environmental variable DISPLAY */
1076 char *env_term; /* environmental variable TERM */ 1190 char *env_term; /* environmental variable TERM */
1077 char *env_colorfgbg; 1191 char *env_colorfgbg;
1078 char *locale; 1192 char *locale;
1079#if 0
1080 char *codeset;
1081#endif
1082 char charsets[4]; 1193 char charsets[4];
1083 unsigned char *v_buffer; /* pointer to physical buffer */ 1194 unsigned char *v_buffer; /* pointer to physical buffer */
1084 unsigned int v_buflen; /* size of area to write */ 1195 unsigned int v_buflen; /* size of area to write */
1085 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1196 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1197
1086#ifdef KEYSYM_RESOURCE 1198#ifdef KEYSYM_RESOURCE
1087 const unsigned char *Keysym_map[256]; 1199 keyboard_manager *keyboard;
1088#endif 1200#endif
1201
1089 const char *rs[NUM_RESOURCES]; 1202 const char *rs[NUM_RESOURCES];
1090 /* command input buffering */ 1203 /* command input buffering */
1091 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1204 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1092 unsigned char cmdbuf_base[CBUFSIZ]; 1205 unsigned char cmdbuf_base[CBUFSIZ];
1093 1206
1094 rxvt_salloc *ralloc; 1207 rxvt_salloc *talloc; // text line allocator
1095 rxvt_salloc *talloc; 1208 rxvt_salloc *ralloc; // rend line allocator
1096 1209
1210 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1211
1212#if ENABLE_FRILLS || ISO_14755
1213 // ISO 14755 entry support
1214 unicode_t iso14755buf;
1215 void commit_iso14755 ();
1216 int hex_keyval (XKeyEvent &ev);
1217# if ISO_14755
1218 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1219 void iso14755_54 (int x, int y);
1220# endif
1221#endif
1222
1223 // modifies first argument(!)
1097 void paste (const unsigned char *data, unsigned int len); 1224 void paste (unsigned char *data, unsigned int len);
1098 1225
1099 void flush (); 1226 void flush ();
1100 1227
1228#if TRANSPARENT
1101 void rootwin_cb (XEvent &xev); 1229 void rootwin_cb (XEvent &xev);
1102 xevent_watcher rootwin_ev; 1230 xevent_watcher rootwin_ev;
1231#endif
1232
1233
1234 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1235 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1103 1236
1104 void x_cb (XEvent &xev); 1237 void x_cb (XEvent &xev);
1105 xevent_watcher termwin_ev; 1238 xevent_watcher termwin_ev;
1106 xevent_watcher vt_ev; 1239 xevent_watcher vt_ev;
1107#ifdef HAVE_SCROLLBARS 1240#ifdef HAVE_SCROLLBARS
… …
1109#endif 1242#endif
1110#ifdef MENUBAR 1243#ifdef MENUBAR
1111 xevent_watcher menubar_ev; 1244 xevent_watcher menubar_ev;
1112#endif 1245#endif
1113 1246
1114 void check_cb (check_watcher &w); check_watcher check_ev; 1247 void check_cb (check_watcher &w); check_watcher check_ev;
1115 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1248 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1249 void flush_cb (time_watcher &w); time_watcher flush_ev;
1116 1250
1117 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1251 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1118 1252
1119 void incr_cb (time_watcher &w); time_watcher incr_ev; 1253 void incr_cb (time_watcher &w); time_watcher incr_ev;
1120 1254
1121#ifdef CURSOR_BLINK 1255#ifdef CURSOR_BLINK
1122 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1256 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1123#endif 1257#endif
1124#ifdef TEXT_BLINK 1258#ifdef TEXT_BLINK
1125 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1259 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1260#endif
1261
1262#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1263 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1264#endif
1265#ifdef SELECTION_SCROLLING
1266 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev;
1267#endif
1268#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1269 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev;
1126#endif 1270#endif
1127 1271
1128#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1129 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1273 void pointer_cb (time_watcher &w); time_watcher pointer_ev;
1130 void pointer_blank (); 1274 void pointer_blank ();
1275#endif
1131 void pointer_unblank (); 1276 void pointer_unblank ();
1132#endif
1133 1277
1134 void tt_printf (const char *fmt,...); 1278 void tt_printf (const char *fmt,...);
1135 void tt_write (const unsigned char *data, unsigned int len); 1279 void tt_write (const unsigned char *data, unsigned int len);
1280 void pty_write ();
1136 1281
1137 void tt_winch (); 1282 void tt_winch ();
1138 1283
1139 rxvt_term (); 1284 rxvt_term ();
1140 ~rxvt_term (); 1285 ~rxvt_term ();
1141 void destroy (); 1286 void destroy ();
1287 void emergency_cleanup ();
1142 1288
1143 bool init (int argc, const char *const *argv); 1289 bool init (int argc, const char *const *argv);
1144 bool init_vars (); 1290 bool init_vars ();
1145 1291
1146 unicode_t next_char ();
1147
1148 bool pty_fill (); 1292 bool pty_fill ();
1149
1150 void *operator new (size_t s);
1151 void operator delete (void *p, size_t s);
1152 1293
1153 void init_secondary (); 1294 void init_secondary ();
1154 const char **init_resources (int argc, const char *const *argv); 1295 const char **init_resources (int argc, const char *const *argv);
1155 void init_env (); 1296 void init_env ();
1156 void set_locale (const char *locale); 1297 void set_locale (const char *locale);
1157 void init_xlocale (); 1298 void init_xlocale ();
1158 void init_command (const char *const *argv); 1299 void init_command (const char *const *argv);
1159 int run_command (const char *const *argv); 1300 void run_command (const char *const *argv);
1160 int run_child (const char *const *argv); 1301 int run_child (const char *const *argv);
1161 1302
1162 void color_aliases (int idx); 1303 void color_aliases (int idx);
1163 void recolour_cursor (); 1304 void recolour_cursor ();
1164 void create_windows (int argc, const char *const *argv); 1305 void create_windows (int argc, const char *const *argv);
1165 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1306 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1166 void window_calc (unsigned int width, unsigned int height); 1307 void window_calc (unsigned int width, unsigned int height);
1167 1308
1168#if USE_XIM 1309#if USE_XIM
1310 rxvt_xim *input_method;
1311 XIC Input_Context;
1312 XIMStyle input_style;
1313 XPoint spot; // most recently sent spot position
1314
1169 void im_destroy (); 1315 void im_destroy ();
1170 void im_cb (); im_watcher im_ev; 1316 void im_cb (); im_watcher im_ev;
1171 void im_set_size (XRectangle *size); 1317 void im_set_size (XRectangle &size);
1172 void im_set_position (XPoint *pos); 1318 void im_set_position (XPoint &pos);
1173 void im_set_color (unsigned long *fg, unsigned long *bg); 1319 void im_set_color (unsigned long &fg, unsigned long &bg);
1174 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect); 1320 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1175 1321
1176 bool IMisRunning (); 1322 bool IMisRunning ();
1177 void IMSendSpot (); 1323 void IMSendSpot ();
1178 bool IM_get_IC (const char *modifiers); 1324 bool IM_get_IC (const char *modifiers);
1179 void IMSetStatusPosition (); 1325 void IMSetStatusPosition ();
… …
1185 1331
1186 void selection_click (int clicks, int x, int y); 1332 void selection_click (int clicks, int x, int y);
1187 void selection_extend (int x, int y, int flag); 1333 void selection_extend (int x, int y, int flag);
1188 void selection_rotate (int x, int y); 1334 void selection_rotate (int x, int y);
1189 1335
1190 /* screen (!) */
1191 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1192 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1193 int scr_scroll_text (int row1, int row2, int count, int spec);
1194 void scr_reset ();
1195 void scr_reset_realloc ();
1196 void scr_release ();
1197 void scr_clear (bool really = true);
1198 void scr_refresh (unsigned char refresh_type);
1199 bool scr_refresh_rend (rend_t mask, rend_t value);
1200 void scr_erase_screen (int mode);
1201 void scr_touch (bool refresh);
1202 void scr_expose (int x, int y, int width, int height, bool refresh);
1203 void scr_remap_chars ();
1204 void scr_remap_chars (text_t *tp, rend_t *rp);
1205
1206 /* autoconvert */ 1336 /* autoconvert */
1207 1337
1208 // command.C 1338 // command.C
1209 void lookup_key (XKeyEvent &ev); 1339 void lookup_key (XKeyEvent &ev);
1210 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1340 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1341
1342 unicode_t next_char ();
1211 unicode_t cmd_getc (); 1343 unicode_t cmd_getc ();
1344 unicode_t next_octet ();
1345 unicode_t cmd_get8 ();
1346
1212 bool cmd_parse (); 1347 bool cmd_parse ();
1213 void mouse_report (XButtonEvent &ev); 1348 void mouse_report (XButtonEvent &ev);
1214 void button_press (XButtonEvent &ev); 1349 void button_press (XButtonEvent &ev);
1215 void button_release (XButtonEvent &ev); 1350 void button_release (XButtonEvent &ev);
1216 int check_our_parents (); 1351 int check_our_parents ();
… …
1225 void process_csi_seq (); 1360 void process_csi_seq ();
1226 void process_window_ops (const int *args, unsigned int nargs); 1361 void process_window_ops (const int *args, unsigned int nargs);
1227 unsigned char *get_to_st (unicode_t &ends_how); 1362 unsigned char *get_to_st (unicode_t &ends_how);
1228 void process_dcs_seq (); 1363 void process_dcs_seq ();
1229 void process_osc_seq (); 1364 void process_osc_seq ();
1365 void process_color_seq (int report, int color, const char *str, unsigned char resp);
1230 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))); 1366 void process_xterm_seq (int op, const char *str, unsigned char resp);
1231 int privcases (int mode, unsigned long bit); 1367 int privcases (int mode, unsigned long bit);
1232 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1368 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1233 void process_sgr_mode (unsigned int nargs, const int *arg); 1369 void process_sgr_mode (unsigned int nargs, const int *arg);
1234 void process_graphics (); 1370 void process_graphics ();
1235 // init.C 1371 // init.C
1236 void Get_Colours (); 1372 void Get_Colours ();
1237 void get_ourmods (); 1373 void get_ourmods ();
1238 // logging.C 1374 // logging.C
1239 void makeutent (const char *pty, const char *hostname); 1375 void makeutent (const char *pty, const char *hostname);
1240 void cleanutent (); 1376 void cleanutent ();
1241 // main.C; 1377 // main.C
1242 void privileges (int mode);
1243 void privileged_utmp (char action); 1378 void privileged_utmp (rxvt_privaction action);
1244 void privileged_ttydev (char action); 1379 bool set_fonts ();
1245 bool change_font (const char *fontname); 1380 void set_string_property (Atom prop, const char *str, int len = -1);
1246 bool font_up_down (int n, int direction); 1381 void set_utf8_property (Atom prop, const char *str, int len = -1);
1247 void set_title (const char *str); 1382 void set_title (const char *str);
1248 void set_icon_name (const char *str); 1383 void set_icon_name (const char *str);
1249 void set_window_color (int idx, const char *color); 1384 void set_window_color (int idx, const char *color);
1250 void set_colorfgbg (); 1385 void set_colorfgbg ();
1251 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1386 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1283 void menubar_control (XButtonEvent &ev); 1418 void menubar_control (XButtonEvent &ev);
1284 void map_menuBar (int map); 1419 void map_menuBar (int map);
1285#endif 1420#endif
1286 1421
1287 // screen.C 1422 // screen.C
1423 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1424 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1425 int scr_scroll_text (int row1, int row2, int count, int spec);
1426 void scr_reset ();
1427 void scr_reset_realloc ();
1428 void scr_release ();
1429 void scr_clear (bool really = false);
1430 void scr_refresh (unsigned char refresh_type);
1431 bool scr_refresh_rend (rend_t mask, rend_t value);
1432 void scr_erase_screen (int mode);
1433 void scr_touch (bool refresh);
1434 void scr_expose (int x, int y, int width, int height, bool refresh);
1435 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1436 void scr_recolour ();
1437 void scr_remap_chars ();
1438 void scr_remap_chars (text_t *tp, rend_t *rp);
1439
1288 void scr_poweron (); 1440 void scr_poweron ();
1289 void scr_cursor (int mode); 1441 void scr_cursor (int mode);
1442 void scr_do_wrap ();
1290 int scr_change_screen (int scrn); 1443 int scr_change_screen (int scrn);
1291 void scr_color (unsigned int color, int fgbg); 1444 void scr_color (unsigned int color, int fgbg);
1292 void scr_rendition (int set, int style); 1445 void scr_rendition (int set, int style);
1293 void scr_add_lines (const unicode_t *str, int nlines, int len); 1446 void scr_add_lines (const unicode_t *str, int nlines, int len);
1294 void scr_backspace (); 1447 void scr_backspace ();
1295 void scr_tab (int count); 1448 void scr_tab (int count, bool ht = false);
1296 void scr_backindex (); 1449 void scr_backindex ();
1297 void scr_forwardindex (); 1450 void scr_forwardindex ();
1298 void scr_gotorc (int row, int col, int relative); 1451 void scr_gotorc (int row, int col, int relative);
1299 void scr_index (enum page_dirn direction); 1452 void scr_index (enum page_dirn direction);
1300 void scr_erase_line (int mode); 1453 void scr_erase_line (int mode);
… …
1312 void set_font_style (); 1465 void set_font_style ();
1313 void scr_charset_choose (int set); 1466 void scr_charset_choose (int set);
1314 void scr_charset_set (int set, unsigned int ch); 1467 void scr_charset_set (int set, unsigned int ch);
1315 int scr_move_to (int y, int len); 1468 int scr_move_to (int y, int len);
1316 int scr_page (enum page_dirn direction, int nlines); 1469 int scr_page (enum page_dirn direction, int nlines);
1317 int scr_changeview (uint16_t oldviewstart); 1470 int scr_changeview (unsigned int oldviewstart);
1318 void scr_bell (); 1471 void scr_bell ();
1319 void scr_printscreen (int fullhist); 1472 void scr_printscreen (int fullhist);
1320 void scr_reverse_selection (); 1473 void scr_reverse_selection ();
1321 void scr_dump (int fd); 1474 void scr_dump (int fd);
1322 void selection_check (int check_more); 1475 void selection_check (int check_more);
1323 int selection_paste (Window win, Atom prop, bool delete_prop); 1476 void selection_paste (Window win, Atom prop, bool delete_prop);
1324 void selection_property (Window win, Atom prop); 1477 void selection_property (Window win, Atom prop);
1325 void selection_request (Time tm, int x, int y); 1478 void selection_request (Time tm, int x, int y);
1326 int selection_request_other (Atom target, int selnum); 1479 int selection_request_other (Atom target, int selnum);
1327 void selection_clear (); 1480 void selection_clear ();
1328 void selection_make (Time tm); 1481 void selection_make (Time tm);
… …
1363 1516
1364 // xdefaults.C 1517 // xdefaults.C
1365 void get_options (int argc, const char *const *argv); 1518 void get_options (int argc, const char *const *argv);
1366 int parse_keysym (const char *str, const char *arg); 1519 int parse_keysym (const char *str, const char *arg);
1367 void get_xdefaults (FILE *stream, const char *name); 1520 void get_xdefaults (FILE *stream, const char *name);
1368 void extract_resources (Display *display, const char *name); 1521 void extract_resources ();
1369 // xpm.C 1522 // xpm.C
1370 int scale_pixmap (const char *geom); 1523 int scale_pixmap (const char *geom);
1371 void resize_pixmap (); 1524 void resize_pixmap ();
1372 Pixmap set_bgPixmap (const char *file); 1525 Pixmap set_bgPixmap (const char *file);
1373}; 1526};
… …
1380#ifdef PROTOTYPES 1533#ifdef PROTOTYPES
1381# define __PROTO(p) p 1534# define __PROTO(p) p
1382#else 1535#else
1383# define __PROTO(p) () 1536# define __PROTO(p) ()
1384#endif 1537#endif
1385#include "protos.h"
1386 1538
1387#ifdef DEBUG_malloc 1539#ifdef DEBUG_malloc
1388# include "dmalloc.h" /* This comes last */ 1540# include "dmalloc.h" /* This comes last */
1389#endif 1541#endif
1390 1542

Diff Legend

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