ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

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

Diff Legend

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