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.102 by root, Tue Aug 17 02:18:38 2004 UTC vs.
Revision 1.153 by root, Mon Feb 21 19:26:07 2005 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1
27#endif
23 28
24/* 29/*
25 ***************************************************************************** 30 *****************************************************************************
26 * SYSTEM HACKS 31 * SYSTEM HACKS
27 ***************************************************************************** 32 *****************************************************************************
… …
80/* 85/*
81 ***************************************************************************** 86 *****************************************************************************
82 * PROTOTYPES 87 * PROTOTYPES
83 ***************************************************************************** 88 *****************************************************************************
84 */ 89 */
90// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 91RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 92RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 93void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 94void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 95void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 96void * rxvt_realloc (void *ptr, size_t size);
97void rxvt_privileges (rxvt_privaction action);
98
99// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len); 100char * rxvt_wcstombs (const wchar_t *str, int len = -1);
101wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
102char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
103wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
92char * rxvt_strdup (const char *str); 104char * rxvt_strdup (const char *str);
105
106// misc.C
93char * rxvt_r_basename (const char *str); 107char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr); 108void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...); 109void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...); 110void rxvt_warn (const char *fmt,...);
97void rxvt_fatal (const char *fmt,...); 111void rxvt_fatal (const char *fmt,...);
… …
99int rxvt_Str_match (const char *s1, const char *s2); 113int rxvt_Str_match (const char *s1, const char *s2);
100const char * rxvt_Str_skip_space (const char *str); 114const char * rxvt_Str_skip_space (const char *str);
101char * rxvt_Str_trim (char *str); 115char * rxvt_Str_trim (char *str);
102int rxvt_Str_escaped (char *str); 116int rxvt_Str_escaped (char *str);
103char ** rxvt_splitcommastring (const char *cs); 117char ** rxvt_splitcommastring (const char *cs);
118void rxvt_freecommastring (char **cs);
104char * rxvt_File_find (const char *file, const char *ext, const char *path); 119char * rxvt_File_find (const char *file, const char *ext, const char *path);
105void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 120void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
106void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 121void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
107
108void rxvt_privileges (rxvt_privaction action);
109 122
110/* 123/*
111 ***************************************************************************** 124 *****************************************************************************
112 * STRUCTURES AND TYPEDEFS 125 * STRUCTURES AND TYPEDEFS
113 ***************************************************************************** 126 *****************************************************************************
… …
123#endif 136#endif
124 137
125/* If we're using either the rxvt scrollbar or menu bars, keep the 138/* If we're using either the rxvt scrollbar or menu bars, keep the
126 * scrollColor resource. 139 * scrollColor resource.
127 */ 140 */
128#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 141#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
129# define KEEP_SCROLLCOLOR 1 142# define KEEP_SCROLLCOLOR 1
130#else 143#else
131# undef KEEP_SCROLLCOLOR 144# undef KEEP_SCROLLCOLOR
132#endif 145#endif
133 146
134#ifdef XPM_BACKGROUND 147#ifdef XPM_BACKGROUND
135typedef struct { 148typedef struct {
136 short w, h, x, y; 149 short w, h, x, y;
137 Pixmap pixmap; 150 Pixmap pixmap;
138} bgPixmap_t; 151} bgPixmap_t;
139#endif 152#endif
140 153
141/* 154/*
142 * the 'essential' information for reporting Mouse Events 155 * the 'essential' information for reporting Mouse Events
143 * pared down from XButtonEvent 156 * pared down from XButtonEvent
144 */ 157 */
145struct mouse_event { 158struct mouse_event {
146 int clicks; 159 int clicks;
147 Time time; /* milliseconds */ 160 Time time; /* milliseconds */
148 unsigned int state; /* key or button mask */ 161 unsigned int state; /* key or button mask */
149 unsigned int button; /* detail */ 162 unsigned int button; /* detail */
150}; 163};
151 164
152#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 165#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
153#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 166#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
154#define SWAP_IT(one, two, typeof) \ 167#define SWAP_IT(one, two, typeof) \
… …
169 INT32 input_mode; 182 INT32 input_mode;
170 CARD32 status; 183 CARD32 status;
171} MWMHints; 184} MWMHints;
172#endif 185#endif
173 186
187#if ENABLE_XEMBED
188// XEMBED messages
189# define XEMBED_EMBEDDED_NOTIFY 0
190# define XEMBED_WINDOW_ACTIVATE 1
191# define XEMBED_WINDOW_DEACTIVATE 2
192# define XEMBED_REQUEST_FOCUS 3
193# define XEMBED_FOCUS_IN 4
194# define XEMBED_FOCUS_OUT 5
195# define XEMBED_FOCUS_NEXT 6
196# define XEMBED_FOCUS_PREV 7
197
198# define XEMBED_MODALITY_ON 10
199# define XEMBED_MODALITY_OFF 11
200# define XEMBED_REGISTER_ACCELERATOR 12
201# define XEMBED_UNREGISTER_ACCELERATOR 13
202# define XEMBED_ACTIVATE_ACCELERATOR 14
203
204// XEMBED detail code
205# define XEMBED_FOCUS_CURRENT 0
206# define XEMBED_FOCUS_FIRST 1
207# define XEMBED_FOCUS_LAST 2
208
209# define XEMBED_MAPPED (1 << 0)
210#endif
211
174/* 212/*
175 ***************************************************************************** 213 *****************************************************************************
176 * NORMAL DEFINES 214 * NORMAL DEFINES
177 ***************************************************************************** 215 *****************************************************************************
178 */ 216 */
… …
183# define COLORTERMENVFULL COLORTERMENV "-xpm" 221# define COLORTERMENVFULL COLORTERMENV "-xpm"
184#else 222#else
185# define COLORTERMENVFULL COLORTERMENV 223# define COLORTERMENVFULL COLORTERMENV
186#endif 224#endif
187#ifndef TERMENV 225#ifndef TERMENV
188# define TERMENV "rxvt" 226# define TERMENV "rxvt-unicode"
189#endif 227#endif
190 228
191#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 229#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
192# define NO_MOUSE_REPORT_SCROLLBAR 1 230# define NO_MOUSE_REPORT_SCROLLBAR 1
193#endif 231#endif
… …
350 SECONDARY, 388 SECONDARY,
351}; 389};
352 390
353#define RS_None 0 /* Normal */ 391#define RS_None 0 /* Normal */
354 392
355#define RS_fgMask 0x000001FFUL /* 512 colors */ 393#define RS_fgMask 0x0000007fUL /* 128 colors */
356#define RS_bgMask 0x0003FE00UL /* 512 colors */ 394#define RS_bgMask 0x00003f80UL /* 128 colors */
395
396// font styles
357#define RS_Bold 0x00040000UL /* bold */ 397#define RS_Bold 0x00004000UL // value 1
358#define RS_Italic 0x00080000UL 398#define RS_Italic 0x00008000UL // value 2
399
400// fake styles
359#define RS_Blink 0x00100000UL /* blink */ 401#define RS_Blink 0x00010000UL /* blink */
360#define RS_RVid 0x00200000UL /* reverse video */ 402#define RS_RVid 0x00020000UL /* reverse video */
361#define RS_Uline 0x00400000UL /* underline */ 403#define RS_Uline 0x00040000UL /* underline */
362 404
405// 5 bits still to go
406
407// other flags
408#define RS_Careful 0x80000000UL /* be careful when drawing these */
409
363#define RS_fontCount 512 410#define RS_styleCount 4
364#define RS_fontMask 0xff800000UL /* plenty(?) of fonts */ 411#define RS_styleMask (RS_Bold | RS_Italic)
365#define RS_fontShift 23 412#define RS_styleShift 14
366 413
367#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 414#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
368#define RS_attrMask (RS_baseattrMask|RS_fontMask) 415#define RS_attrMask (RS_baseattrMask | RS_fontMask)
416
417#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
418#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
419#define RS_fontShift 24
420
421#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
422#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
369 423
370#define Sel_none 0 /* Not waiting */ 424#define Sel_none 0 /* Not waiting */
371#define Sel_normal 0x01 /* normal selection */ 425#define Sel_normal 0x01 /* normal selection */
372#define Sel_incr 0x02 /* incremental selection */ 426#define Sel_incr 0x02 /* incremental selection */
373#define Sel_direct 0x00 427#define Sel_direct 0x00
… …
418 XTerm_Color_UL = 19, // change actual 'Underline' color 472 XTerm_Color_UL = 19, // change actual 'Underline' color
419 XTerm_Pixmap = 20, // new bg pixmap 473 XTerm_Pixmap = 20, // new bg pixmap
420 XTerm_restoreFG = 39, // change default fg color 474 XTerm_restoreFG = 39, // change default fg color
421 XTerm_restoreBG = 49, // change default bg color 475 XTerm_restoreBG = 49, // change default bg color
422 XTerm_dumpscreen = 55, // dump scrollback and all of screen 476 XTerm_dumpscreen = 55, // dump scrollback and all of screen
477
423 XTerm_locale = 701, // change locale 478 URxvt_locale = 701, // change locale
424 XTerm_findfont = 702, // find font of given character (in decimal)
425 XTerm_Menu = 703, // set menu item 479 URxvt_Menu = 703, // set menu item
480 URxvt_Color_IT = 704, // change actual 'Italic' colour
481 URxvt_Color_tint = 705, // change actual tint colour
482
483 URxvt_font = 710,
484 URxvt_boldFont = 711,
485 URxvt_italicFont = 712,
486 URxvt_boldItalicFont = 713,
487
488 URxvt_view_up = 720,
489 URxvt_view_down = 721,
426}; 490};
427 491
428/* Words starting with `Color_' are colours. Others are counts */ 492/* Words starting with `Color_' are colours. Others are counts */
429/* 493/*
430 * The following comment is mostly obsolete since pixcolor_set was expanded: 494 * The following comment is mostly obsolete since pixcolor_set was expanded:
… …
459 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 523 maxBrightCOLOR, /* minBrightCOLOR + 7 */
460 Color_White = maxBrightCOLOR, 524 Color_White = maxBrightCOLOR,
461#else 525#else
462 Color_White = maxCOLOR, 526 Color_White = maxCOLOR,
463#endif 527#endif
464#ifdef TTY_256COLOR
465 min256COLOR = Color_White + 1, 528 minTermCOLOR = Color_White + 1,
466 max256COLOR = minCOLOR + 255, 529 maxTermCOLOR = Color_White + 72,
467#endif
468#ifndef NO_CURSORCOLOR 530#ifndef NO_CURSORCOLOR
469 Color_cursor, 531 Color_cursor,
470 Color_cursor2, 532 Color_cursor2,
471#endif 533#endif
472 Color_pointer_fg, 534 Color_pointer_fg,
473 Color_pointer_bg, 535 Color_pointer_bg,
474 Color_border, 536 Color_border,
475#ifndef NO_BOLD_UNDERLINE_REVERSE 537#ifndef NO_BOLD_UNDERLINE_REVERSE
476 Color_BD, 538 Color_BD,
539 Color_IT,
477 Color_UL, 540 Color_UL,
478 Color_RV, 541 Color_RV,
542#endif
543#if ENABLE_FRILLS
544 Color_underline,
479#endif 545#endif
480#ifdef OPTION_HC 546#ifdef OPTION_HC
481 Color_HC, 547 Color_HC,
482#endif 548#endif
483#ifdef KEEP_SCROLLCOLOR 549#ifdef KEEP_SCROLLCOLOR
… …
489#endif 555#endif
490 NRS_COLORS, /* */ 556 NRS_COLORS, /* */
491#ifdef KEEP_SCROLLCOLOR 557#ifdef KEEP_SCROLLCOLOR
492 Color_topShadow = NRS_COLORS, 558 Color_topShadow = NRS_COLORS,
493 Color_bottomShadow, 559 Color_bottomShadow,
494 TOTAL_COLORS /* upto 30 */ 560 TOTAL_COLORS
495#else 561#else
496 TOTAL_COLORS = NRS_COLORS /* */ 562 TOTAL_COLORS = NRS_COLORS
497#endif 563#endif
498}; 564};
499 565
500#define Color_Bits 9 566#define Color_Bits 7 // 0 .. maxTermCOLOR
567
501#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 568#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
502#define NPIXCLR_BITS 32 569#define NPIXCLR_BITS 32
503
504#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
505 570
506/* 571/*
507 * Resource list 572 * Resource list
508 */ 573 */
509enum { 574enum {
… …
513 Rs_geometry, 578 Rs_geometry,
514 Rs_reverseVideo, 579 Rs_reverseVideo,
515 Rs_color, 580 Rs_color,
516 _Rs_color = Rs_color + NRS_COLORS - 1, 581 _Rs_color = Rs_color + NRS_COLORS - 1,
517 Rs_font, 582 Rs_font,
583#if ENABLE_STYLES
584 Rs_boldFont,
585 Rs_italicFont,
586 Rs_boldItalicFont,
587#endif
518 Rs_name, 588 Rs_name,
519 Rs_title, 589 Rs_title,
520#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 590#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
521 Rs_path, 591 Rs_path,
522#endif 592#endif
… …
531#ifdef HAVE_SCROLLBARS 601#ifdef HAVE_SCROLLBARS
532 Rs_scrollBar, 602 Rs_scrollBar,
533 Rs_scrollBar_right, 603 Rs_scrollBar_right,
534 Rs_scrollBar_floating, 604 Rs_scrollBar_floating,
535 Rs_scrollBar_align, 605 Rs_scrollBar_align,
536#endif
537 Rs_scrollstyle, /* Rs_scrollBar_style */ 606 Rs_scrollstyle, /* Rs_scrollBar_style */
607 Rs_scrollBar_thickness,
608#endif
538 Rs_scrollTtyOutput, 609 Rs_scrollTtyOutput,
539 Rs_scrollTtyKeypress, 610 Rs_scrollTtyKeypress,
540 Rs_scrollWithBuffer, 611 Rs_scrollWithBuffer,
541 Rs_saveLines, 612 Rs_saveLines,
542 Rs_utmpInhibit, 613 Rs_utmpInhibit,
… …
570#endif 641#endif
571#if ENABLE_FRILLS 642#if ENABLE_FRILLS
572 Rs_ext_bwidth, 643 Rs_ext_bwidth,
573 Rs_int_bwidth, 644 Rs_int_bwidth,
574 Rs_borderLess, 645 Rs_borderLess,
575#endif
576 Rs_scrollBar_thickness,
577#ifndef NO_LINESPACE
578 Rs_lineSpace, 646 Rs_lineSpace,
647 Rs_pty_fd,
648#endif
649#if ENABLE_XEMBED
650 Rs_embed,
579#endif 651#endif
580 Rs_cutchars, 652 Rs_cutchars,
581 Rs_modifier, 653 Rs_modifier,
582 Rs_answerbackstring, 654 Rs_answerbackstring,
583 Rs_tripleclickwords, 655 Rs_tripleclickwords,
584 Rs_insecure, 656 Rs_insecure,
585 Rs_cursorBlink, 657 Rs_cursorBlink,
586 Rs_pointerBlank, 658 Rs_pointerBlank,
587 Rs_pointerBlankDelay, 659 Rs_pointerBlankDelay,
588 Rs_imLocale, 660 Rs_imLocale,
661 Rs_imFont,
662 Rs_pastableTabs,
589#ifndef NO_SECONDARY_SCREEN 663#ifndef NO_SECONDARY_SCREEN
590 Rs_secondaryScreen, 664 Rs_secondaryScreen,
591 Rs_secondaryScroll, 665 Rs_secondaryScroll,
592#endif
593#ifndef NO_BOLD_UNDERLINE_REVERSE
594 Rs_realBold,
595#endif 666#endif
596#ifdef OFF_FOCUS_FADING 667#ifdef OFF_FOCUS_FADING
597 Rs_fade, 668 Rs_fade,
598#endif 669#endif
599#ifdef TINTING 670#ifdef TINTING
… …
610 XA_MULTIPLE, 681 XA_MULTIPLE,
611 XA_TARGETS, 682 XA_TARGETS,
612 XA_TIMESTAMP, 683 XA_TIMESTAMP,
613 XA_VT_SELECTION, 684 XA_VT_SELECTION,
614 XA_INCR, 685 XA_INCR,
686 XA_WM_PROTOCOLS,
615 XA_WMDELETEWINDOW, 687 XA_WM_DELETE_WINDOW,
688 XA_CLIPBOARD,
689#if ENABLE_FRILLS
690 XA_MOTIF_WM_HINTS,
691#endif
692#if ENABLE_EWMH
693 XA_NET_WM_PID,
694 XA_NET_WM_NAME,
695 XA_NET_WM_ICON_NAME,
696 XA_NET_WM_PING,
697#endif
698#if USE_XIM
699 XA_WM_LOCALE_NAME,
700#endif
616#ifdef TRANSPARENT 701#if TRANSPARENT
617 XA_XROOTPMAPID, 702 XA_XROOTPMAP_ID,
618 XA_XSETROOTID, 703 XA_ESETROOT_PMAP_ID,
619#endif 704#endif
620#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 705#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
621 XA_DNDPROTOCOL, 706 XA_DNDPROTOCOL,
622 XA_DNDSELECTION, 707 XA_DNDSELECTION,
623#endif /* OFFIX_DND */ 708#endif
624 XA_CLIPBOARD, 709#if ENABLE_XEMBED
710 XA_XEMBED,
711 XA_XEMBED_INFO,
712#endif
625 NUM_XA 713 NUM_XA
626}; 714};
627 715
628/* DEC private modes */ 716/* DEC private modes */
629#define PrivMode_132 (1UL<<0) 717#define PrivMode_132 (1UL<<0)
… …
656 priv_modes |= (bit); \ 744 priv_modes |= (bit); \
657 else \ 745 else \
658 priv_modes &= ~(bit) 746 priv_modes &= ~(bit)
659 747
660#ifdef ALLOW_132_MODE 748#ifdef ALLOW_132_MODE
661# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 749# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
662#else 750#else
663# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 751# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
664#endif 752#endif
665 753
666// do not change these constants lightly, there are many interdependencies 754// do not change these constants lightly, there are many interdependencies
667#define IMBUFSIZ 128 // input modifier buffer sizes 755#define IMBUFSIZ 128 // input modifier buffer sizes
668#define KBUFSZ 512 // size of keyboard mapping buffer 756#define KBUFSZ 512 // size of keyboard mapping buffer
… …
719#define strdup(x) strdup((const char *)(x)) 807#define strdup(x) strdup((const char *)(x))
720#define strlen(x) strlen((const char *)(x)) 808#define strlen(x) strlen((const char *)(x))
721#define strchr(x, y) strchr((const char *)(x), (int)(y)) 809#define strchr(x, y) strchr((const char *)(x), (int)(y))
722#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 810#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
723 811
812#define dDisp Display *disp = display->display
813
724/* convert pixel dimensions to row/column values. Everything as int32_t */ 814/* convert pixel dimensions to row/column values. Everything as int32_t */
725#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 815#define Pixel2Col(x) Pixel2Width((int32_t)(x))
726#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 816#define Pixel2Row(y) Pixel2Height((int32_t)(y))
727#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 817#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
728#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 818#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
… …
754# define GET_FGCOLOR(x) GET_BASEFG(x) 844# define GET_FGCOLOR(x) GET_BASEFG(x)
755# define GET_BGCOLOR(x) GET_BASEBG(x) 845# define GET_BGCOLOR(x) GET_BASEBG(x)
756#endif 846#endif
757 847
758#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 848#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
759#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 849#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
850
851#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
852#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
760 853
761#define GET_ATTR(x) (((x) & RS_attrMask)) 854#define GET_ATTR(x) (((x) & RS_attrMask))
762#define GET_BGATTR(x) \ 855#define GET_BGATTR(x) \
763 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 856 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
764 | (((x) & RS_fgMask)<<Color_Bits)) \ 857 | (((x) & RS_fgMask)<<Color_Bits)) \
765 : ((x) & (RS_attrMask | RS_bgMask))) 858 : ((x) & (RS_attrMask | RS_bgMask)))
766#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 859#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
767#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 860#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
768#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 861#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
862
863#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
769 864
770#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 865#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
771#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 866#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
867
868#if ENABLE_STYLES
869# define FONTSET(style) TermWin.fontset[GET_STYLE (style)]
870#else
871# define FONTSET(style) TermWin.fontset[0]
872#endif
772 873
773#ifdef HAVE_SCROLLBARS 874#ifdef HAVE_SCROLLBARS
774# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 875# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
775#else 876#else
776# define scrollbar_TotalWidth() (0) 877# define scrollbar_TotalWidth() (0)
… …
815# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 916# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
816#else 917#else
817# define XPMClearArea(a, b, c, d, e, f, g) 918# define XPMClearArea(a, b, c, d, e, f, g)
818#endif 919#endif
819 920
820#ifndef STRICT_FONT_CHECKING
821# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
822#endif
823
824#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
825#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
826
827#ifdef UTMP_SUPPORT 921#ifdef UTMP_SUPPORT
828# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 922# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
829# undef HAVE_UTMPX_H 923# undef HAVE_UTMPX_H
830# undef HAVE_STRUCT_UTMPX 924# undef HAVE_STRUCT_UTMPX
831# endif 925# endif
… …
903 997
904 operator mbstate_t *() { return &mbs; } 998 operator mbstate_t *() { return &mbs; }
905 void reset () { memset (&mbs, 0, sizeof (mbs)); } 999 void reset () { memset (&mbs, 0, sizeof (mbs)); }
906 mbstate () { reset (); } 1000 mbstate () { reset (); }
907}; 1001};
1002
1003#define UNICODE_MASK 0x1fffffUL
908 1004
909#if UNICODE3 1005#if UNICODE3
910# define COMPOSE_LO 0x40000000UL 1006# define COMPOSE_LO 0x40000000UL
911# define COMPOSE_HI 0x400fffffUL 1007# define COMPOSE_HI 0x400fffffUL
912# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 1008# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
942 1038
943extern class rxvt_composite_vec rxvt_composite; 1039extern class rxvt_composite_vec rxvt_composite;
944#endif 1040#endif
945 1041
946 1042
1043#ifdef KEYSYM_RESOURCE
1044 class keyboard_manager;
1045#endif
1046
947struct rxvt_term : rxvt_vars { 1047struct rxvt_term : zero_initialized, rxvt_vars {
948 log_callback *log_hook; // log error messages through this hook, if != 0 1048 log_callback *log_hook; // log error messages through this hook, if != 0
949 1049
950 struct mbstate mbstate; // current input multibyte state 1050 struct mbstate mbstate; // current input multibyte state
951 1051
952 unsigned char want_refresh:1, 1052 unsigned char want_refresh:1,
… …
968 hidden_text:1, 1068 hidden_text:1,
969#endif 1069#endif
970#ifdef POINTER_BLANK 1070#ifdef POINTER_BLANK
971 hidden_pointer:1, 1071 hidden_pointer:1,
972#endif 1072#endif
973// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1073 enc_utf8:1, /* wether locale uses utf-8 */
974 seen_input:1, /* wether we have seen some program output yet */ 1074 seen_input:1, /* wether we have seen some program output yet */
1075 seen_resize:1, /* wether we had a resize event */
975 parsed_geometry:1; 1076 parsed_geometry:1;
976 1077
977 unsigned char refresh_type, 1078 unsigned char refresh_type,
978#ifdef META8_OPTION 1079#ifdef META8_OPTION
979 meta_char, /* Alt-key prefix */ 1080 meta_char, /* Alt-key prefix */
… …
981 scrollbar_align, 1082 scrollbar_align,
982 selection_wait, 1083 selection_wait,
983 selection_type; 1084 selection_type;
984/* ---------- */ 1085/* ---------- */
985 short rvideo; 1086 short rvideo;
986 int16_t num_scr; /* screen: number lines scrolled */ 1087 int num_scr; /* screen: number lines scrolled */
987 unsigned int prev_ncol, /* screen: previous number of columns */ 1088 int prev_ncol, /* screen: previous number of columns */
988 prev_nrow; /* screen: previous number of rows */ 1089 prev_nrow; /* screen: previous number of rows */
989/* ---------- */ 1090/* ---------- */
990 rend_t rstyle; 1091 rend_t rstyle;
991/* ---------- */ 1092/* ---------- */
992 uint32_t pixcolor_set[NPIXCLR_SETS]; 1093 uint32_t pixcolor_set[NPIXCLR_SETS];
… …
1023# ifdef POINTER_BLANK 1124# ifdef POINTER_BLANK
1024 pointerBlankDelay, 1125 pointerBlankDelay,
1025# endif 1126# endif
1026 allowedxerror; 1127 allowedxerror;
1027/* ---------- */ 1128/* ---------- */
1028 unsigned int ModMetaMask, 1129 unsigned int ModLevel3Mask,
1130 ModMetaMask,
1029 ModNumLockMask, 1131 ModNumLockMask;
1030#ifndef NO_BRIGHTCOLOR
1031 colorfgbg,
1032#endif
1033 old_width, /* last used width in screen resize */ 1132 int old_width, /* last used width in screen resize */
1034 old_height; /* last used height in screen resize */ 1133 old_height; /* last used height in screen resize */
1035 unsigned long priv_modes, 1134 unsigned long priv_modes,
1036 SavedModes; 1135 SavedModes;
1037/* ---------- */ 1136/* ---------- */
1038 Atom xa[NUM_XA]; 1137 Atom xa[NUM_XA];
… …
1066#endif 1165#endif
1067/* ---------- */ 1166/* ---------- */
1068 Time selection_time, 1167 Time selection_time,
1069 selection_request_time; 1168 selection_request_time;
1070 pid_t cmd_pid; /* process id of child */ 1169 pid_t cmd_pid; /* process id of child */
1170 char * incr_buf;
1171 size_t incr_buf_size, incr_buf_fill;
1071/* ---------- */ 1172/* ---------- */
1072 Cursor leftptr_cursor; 1173 Cursor leftptr_cursor;
1073#ifdef POINTER_BLANK
1074 Cursor blank_cursor;
1075#endif
1076/* ---------- */ 1174/* ---------- */
1077#ifndef NO_BACKSPACE_KEY 1175#ifndef NO_BACKSPACE_KEY
1078 const char *key_backspace; 1176 const char *key_backspace;
1079#endif 1177#endif
1080#ifndef NO_DELETE_KEY 1178#ifndef NO_DELETE_KEY
1081 const char *key_delete; 1179 const char *key_delete;
1082#endif
1083#ifdef USE_XIM
1084 rxvt_xim *input_method;
1085 XIC Input_Context;
1086 XIMStyle input_style;
1087#endif 1180#endif
1088 struct mouse_event MEvent; 1181 struct mouse_event MEvent;
1089 XComposeStatus compose; 1182 XComposeStatus compose;
1090 ttymode_t tio; 1183 ttymode_t tio;
1091#ifdef UTMP_SUPPORT 1184#ifdef UTMP_SUPPORT
… …
1128 void scr_swap_overlay (); 1221 void scr_swap_overlay ();
1129 void scr_overlay_new (int x, int y, int w, int h); 1222 void scr_overlay_new (int x, int y, int w, int h);
1130 void scr_overlay_off (); 1223 void scr_overlay_off ();
1131 void scr_overlay_set (int x, int y, 1224 void scr_overlay_set (int x, int y,
1132 text_t text, 1225 text_t text,
1133 rend_t rend = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg)); 1226 rend_t rend = OVERLAY_RSTYLE);
1134 void scr_overlay_set (int x, int y, const char *s); 1227 void scr_overlay_set (int x, int y, const char *s);
1135#endif 1228#endif
1136 1229
1137 vector<void *> allocated; // free these memory blocks with free() 1230 vector<void *> allocated; // free these memory blocks with free()
1138 1231
1139 char *env_windowid; /* environmental variable WINDOWID */ 1232 char *env_windowid; /* environmental variable WINDOWID */
1140 char *env_display; /* environmental variable DISPLAY */ 1233 char *env_display; /* environmental variable DISPLAY */
1141 char *env_term; /* environmental variable TERM */ 1234 char *env_term; /* environmental variable TERM */
1142 char *env_colorfgbg; 1235 char *env_colorfgbg;
1143 char *locale; 1236 char *locale;
1144#if 0
1145 char *codeset;
1146#endif
1147 char charsets[4]; 1237 char charsets[4];
1148 unsigned char *v_buffer; /* pointer to physical buffer */ 1238 unsigned char *v_buffer; /* pointer to physical buffer */
1149 unsigned int v_buflen; /* size of area to write */ 1239 unsigned int v_buflen; /* size of area to write */
1150 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1240 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1241
1151#ifdef KEYSYM_RESOURCE 1242#ifdef KEYSYM_RESOURCE
1152 const unsigned char *Keysym_map[256]; 1243 keyboard_manager *keyboard;
1153#endif 1244#endif
1245
1154 const char *rs[NUM_RESOURCES]; 1246 const char *rs[NUM_RESOURCES];
1155 /* command input buffering */ 1247 /* command input buffering */
1156 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1248 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1157 unsigned char cmdbuf_base[CBUFSIZ]; 1249 unsigned char cmdbuf_base[CBUFSIZ];
1158 1250
… …
1165 // ISO 14755 entry support 1257 // ISO 14755 entry support
1166 unicode_t iso14755buf; 1258 unicode_t iso14755buf;
1167 void commit_iso14755 (); 1259 void commit_iso14755 ();
1168 int hex_keyval (XKeyEvent &ev); 1260 int hex_keyval (XKeyEvent &ev);
1169# if ISO_14755 1261# if ISO_14755
1170 void iso14755_51 (wchar_t ch); 1262 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1171 void iso14755_54 (int x, int y); 1263 void iso14755_54 (int x, int y);
1172# endif 1264# endif
1173#endif 1265#endif
1174 1266
1267 // modifies first argument(!)
1175 void paste (const unsigned char *data, unsigned int len); 1268 void paste (unsigned char *data, unsigned int len);
1176 1269
1177 void flush (); 1270 void flush ();
1178 1271
1179#if TRANSPARENT 1272#if TRANSPARENT
1180 void rootwin_cb (XEvent &xev); 1273 void rootwin_cb (XEvent &xev);
1181 xevent_watcher rootwin_ev; 1274 xevent_watcher rootwin_ev;
1182#endif 1275#endif
1276
1277
1278 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1279 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1183 1280
1184 void x_cb (XEvent &xev); 1281 void x_cb (XEvent &xev);
1185 xevent_watcher termwin_ev; 1282 xevent_watcher termwin_ev;
1186 xevent_watcher vt_ev; 1283 xevent_watcher vt_ev;
1187#ifdef HAVE_SCROLLBARS 1284#ifdef HAVE_SCROLLBARS
… …
1222#endif 1319#endif
1223 void pointer_unblank (); 1320 void pointer_unblank ();
1224 1321
1225 void tt_printf (const char *fmt,...); 1322 void tt_printf (const char *fmt,...);
1226 void tt_write (const unsigned char *data, unsigned int len); 1323 void tt_write (const unsigned char *data, unsigned int len);
1324 void pty_write ();
1227 1325
1228 void tt_winch (); 1326 void tt_winch ();
1229 1327
1230 rxvt_term (); 1328 rxvt_term ();
1231 ~rxvt_term (); 1329 ~rxvt_term ();
1232 void destroy (); 1330 void destroy ();
1331 void emergency_cleanup ();
1233 1332
1234 bool init (int argc, const char *const *argv); 1333 bool init (int argc, const char *const *argv);
1235 bool init_vars (); 1334 bool init_vars ();
1236 1335
1237 bool pty_fill (); 1336 bool pty_fill ();
1238
1239 void *operator new (size_t s);
1240 void operator delete (void *p, size_t s);
1241 1337
1242 void init_secondary (); 1338 void init_secondary ();
1243 const char **init_resources (int argc, const char *const *argv); 1339 const char **init_resources (int argc, const char *const *argv);
1244 void init_env (); 1340 void init_env ();
1245 void set_locale (const char *locale); 1341 void set_locale (const char *locale);
1246 void init_xlocale (); 1342 void init_xlocale ();
1247 void init_command (const char *const *argv); 1343 void init_command (const char *const *argv);
1248 void run_command (const char *const *argv); 1344 void run_command (const char *const *argv);
1249 int run_child (const char *const *argv); 1345 int run_child (const char *const *argv);
1250 static void child_exited (int pid);
1251 1346
1252 void color_aliases (int idx); 1347 void color_aliases (int idx);
1253 void recolour_cursor (); 1348 void recolour_cursor ();
1254 void create_windows (int argc, const char *const *argv); 1349 void create_windows (int argc, const char *const *argv);
1255 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1350 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1256 void window_calc (unsigned int width, unsigned int height); 1351 void window_calc (unsigned int width, unsigned int height);
1257 1352
1258#if USE_XIM 1353#if USE_XIM
1354 rxvt_xim *input_method;
1355 XIC Input_Context;
1356 XIMStyle input_style;
1357 XPoint spot; // most recently sent spot position
1358
1259 void im_destroy (); 1359 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1360 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1361 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos); 1362 void im_set_position (XPoint &pos);
1263 void im_set_color (unsigned long &fg, unsigned long &bg); 1363 void im_set_color (unsigned long &fg, unsigned long &bg);
… …
1290 1390
1291 bool cmd_parse (); 1391 bool cmd_parse ();
1292 void mouse_report (XButtonEvent &ev); 1392 void mouse_report (XButtonEvent &ev);
1293 void button_press (XButtonEvent &ev); 1393 void button_press (XButtonEvent &ev);
1294 void button_release (XButtonEvent &ev); 1394 void button_release (XButtonEvent &ev);
1395 void focus_in ();
1396 void focus_out ();
1295 int check_our_parents (); 1397 int check_our_parents ();
1296#ifdef PRINTPIPE 1398#ifdef PRINTPIPE
1297 FILE *popen_printer (); 1399 FILE *popen_printer ();
1298 int pclose_printer (FILE *stream); 1400 int pclose_printer (FILE *stream);
1299#endif 1401#endif
… …
1318 // logging.C 1420 // logging.C
1319 void makeutent (const char *pty, const char *hostname); 1421 void makeutent (const char *pty, const char *hostname);
1320 void cleanutent (); 1422 void cleanutent ();
1321 // main.C 1423 // main.C
1322 void privileged_utmp (rxvt_privaction action); 1424 void privileged_utmp (rxvt_privaction action);
1323 bool change_font (const char *fontname); 1425 bool set_fonts ();
1324 bool font_up_down (int n, int direction); 1426 void set_string_property (Atom prop, const char *str, int len = -1);
1427 void set_utf8_property (Atom prop, const char *str, int len = -1);
1325 void set_title (const char *str); 1428 void set_title (const char *str);
1326 void set_icon_name (const char *str); 1429 void set_icon_name (const char *str);
1327 void set_window_color (int idx, const char *color); 1430 void set_window_color (int idx, const char *color);
1328 void set_colorfgbg (); 1431 void set_colorfgbg ();
1329 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1432 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1371 void scr_release (); 1474 void scr_release ();
1372 void scr_clear (bool really = false); 1475 void scr_clear (bool really = false);
1373 void scr_refresh (unsigned char refresh_type); 1476 void scr_refresh (unsigned char refresh_type);
1374 bool scr_refresh_rend (rend_t mask, rend_t value); 1477 bool scr_refresh_rend (rend_t mask, rend_t value);
1375 void scr_erase_screen (int mode); 1478 void scr_erase_screen (int mode);
1479 void scr_erase_savelines ();
1376 void scr_touch (bool refresh); 1480 void scr_touch (bool refresh);
1377 void scr_expose (int x, int y, int width, int height, bool refresh); 1481 void scr_expose (int x, int y, int width, int height, bool refresh);
1482 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1483 void scr_recolour ();
1378 void scr_remap_chars (); 1484 void scr_remap_chars ();
1379 void scr_remap_chars (text_t *tp, rend_t *rp); 1485 void scr_remap_chars (text_t *tp, rend_t *rp);
1380 1486
1381 void scr_poweron (); 1487 void scr_poweron ();
1382 void scr_cursor (int mode); 1488 void scr_cursor (int mode);
… …
1384 int scr_change_screen (int scrn); 1490 int scr_change_screen (int scrn);
1385 void scr_color (unsigned int color, int fgbg); 1491 void scr_color (unsigned int color, int fgbg);
1386 void scr_rendition (int set, int style); 1492 void scr_rendition (int set, int style);
1387 void scr_add_lines (const unicode_t *str, int nlines, int len); 1493 void scr_add_lines (const unicode_t *str, int nlines, int len);
1388 void scr_backspace (); 1494 void scr_backspace ();
1389 void scr_tab (int count); 1495 void scr_tab (int count, bool ht = false);
1390 void scr_backindex (); 1496 void scr_backindex ();
1391 void scr_forwardindex (); 1497 void scr_forwardindex ();
1392 void scr_gotorc (int row, int col, int relative); 1498 void scr_gotorc (int row, int col, int relative);
1393 void scr_index (enum page_dirn direction); 1499 void scr_index (enum page_dirn direction);
1394 void scr_erase_line (int mode); 1500 void scr_erase_line (int mode);
… …
1406 void set_font_style (); 1512 void set_font_style ();
1407 void scr_charset_choose (int set); 1513 void scr_charset_choose (int set);
1408 void scr_charset_set (int set, unsigned int ch); 1514 void scr_charset_set (int set, unsigned int ch);
1409 int scr_move_to (int y, int len); 1515 int scr_move_to (int y, int len);
1410 int scr_page (enum page_dirn direction, int nlines); 1516 int scr_page (enum page_dirn direction, int nlines);
1411 int scr_changeview (uint16_t oldviewstart); 1517 int scr_changeview (unsigned int oldviewstart);
1412 void scr_bell (); 1518 void scr_bell ();
1413 void scr_printscreen (int fullhist); 1519 void scr_printscreen (int fullhist);
1414 void scr_reverse_selection (); 1520 void scr_reverse_selection ();
1415 void scr_dump (int fd); 1521 void scr_dump (int fd);
1416 void selection_check (int check_more); 1522 void selection_check (int check_more);
1417 int selection_paste (Window win, Atom prop, bool delete_prop); 1523 void selection_paste (Window win, Atom prop, bool delete_prop);
1418 void selection_property (Window win, Atom prop); 1524 void selection_property (Window win, Atom prop);
1419 void selection_request (Time tm, int x, int y); 1525 void selection_request (Time tm, int x, int y);
1420 int selection_request_other (Atom target, int selnum); 1526 int selection_request_other (Atom target, int selnum);
1421 void selection_clear (); 1527 void selection_clear ();
1422 void selection_make (Time tm); 1528 void selection_make (Time tm);
… …
1457 1563
1458 // xdefaults.C 1564 // xdefaults.C
1459 void get_options (int argc, const char *const *argv); 1565 void get_options (int argc, const char *const *argv);
1460 int parse_keysym (const char *str, const char *arg); 1566 int parse_keysym (const char *str, const char *arg);
1461 void get_xdefaults (FILE *stream, const char *name); 1567 void get_xdefaults (FILE *stream, const char *name);
1462 void extract_resources (Display *display, const char *name); 1568 void extract_resources ();
1463 // xpm.C 1569 // xpm.C
1464 int scale_pixmap (const char *geom); 1570 int scale_pixmap (const char *geom);
1465 void resize_pixmap (); 1571 void resize_pixmap ();
1466 Pixmap set_bgPixmap (const char *file); 1572 Pixmap set_bgPixmap (const char *file);
1467}; 1573};

Diff Legend

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