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.178 by root, Sun Jan 1 14:43:43 2006 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
28#endif
23 29
24/* 30/*
25 ***************************************************************************** 31 *****************************************************************************
26 * SYSTEM HACKS 32 * SYSTEM HACKS
27 ***************************************************************************** 33 *****************************************************************************
… …
71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) 77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) 78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
73# define NO_SETOWNER_TTYDEV 1 79# define NO_SETOWNER_TTYDEV 1
74# endif 80# endif
75#endif 81#endif
76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY) 82#if defined(__CYGWIN32__)
77# define NO_SETOWNER_TTYDEV 1 83# define NO_SETOWNER_TTYDEV 1
78#endif 84#endif
79 85
80/* 86/*
81 ***************************************************************************** 87 *****************************************************************************
82 * PROTOTYPES 88 * PROTOTYPES
83 ***************************************************************************** 89 *****************************************************************************
84 */ 90 */
91// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 92RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 93RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 94void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 95void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 96void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 97void * rxvt_realloc (void *ptr, size_t size);
98void rxvt_privileges (rxvt_privaction action);
99
100// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len); 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 123void rxvt_usleep (int usecs);
108void rxvt_privileges (rxvt_privaction action);
109 124
110/* 125/*
111 ***************************************************************************** 126 *****************************************************************************
112 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
113 ***************************************************************************** 128 *****************************************************************************
… …
123#endif 138#endif
124 139
125/* If we're using either the rxvt scrollbar or menu bars, keep the 140/* If we're using either the rxvt scrollbar or menu bars, keep the
126 * scrollColor resource. 141 * scrollColor resource.
127 */ 142 */
128#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
129# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
130#else 145#else
131# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
132#endif 147#endif
133 148
134#ifdef XPM_BACKGROUND 149#ifdef XPM_BACKGROUND
135typedef struct { 150typedef struct {
136 short w, h, x, y; 151 short w, h, x, y;
137 Pixmap pixmap; 152 Pixmap pixmap;
138} bgPixmap_t; 153} bgPixmap_t;
139#endif 154#endif
140 155
141/* 156/*
142 * the 'essential' information for reporting Mouse Events 157 * the 'essential' information for reporting Mouse Events
143 * pared down from XButtonEvent 158 * pared down from XButtonEvent
144 */ 159 */
145struct mouse_event { 160struct mouse_event {
146 int clicks; 161 int clicks;
147 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
148 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
149 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
150}; 165};
151
152#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
153#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
154#define SWAP_IT(one, two, typeof) \
155 do { \
156 typeof swapittmp; \
157 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
158 } while (/* CONSTCOND */ 0)
159#define BOUND_POSITIVE_INT16(val) \
160 (int16_t) ((val) <= 0 \
161 ? 0 \
162 : min ((val), (((uint16_t)-1)>>1)))
163 166
164#if ENABLE_FRILLS 167#if ENABLE_FRILLS
165typedef struct _mwmhints { 168typedef struct _mwmhints {
166 CARD32 flags; 169 CARD32 flags;
167 CARD32 functions; 170 CARD32 functions;
… …
169 INT32 input_mode; 172 INT32 input_mode;
170 CARD32 status; 173 CARD32 status;
171} MWMHints; 174} MWMHints;
172#endif 175#endif
173 176
177#if ENABLE_XEMBED
178// XEMBED messages
179# define XEMBED_EMBEDDED_NOTIFY 0
180# define XEMBED_WINDOW_ACTIVATE 1
181# define XEMBED_WINDOW_DEACTIVATE 2
182# define XEMBED_REQUEST_FOCUS 3
183# define XEMBED_FOCUS_IN 4
184# define XEMBED_FOCUS_OUT 5
185# define XEMBED_FOCUS_NEXT 6
186# define XEMBED_FOCUS_PREV 7
187
188# define XEMBED_MODALITY_ON 10
189# define XEMBED_MODALITY_OFF 11
190# define XEMBED_REGISTER_ACCELERATOR 12
191# define XEMBED_UNREGISTER_ACCELERATOR 13
192# define XEMBED_ACTIVATE_ACCELERATOR 14
193
194// XEMBED detail code
195# define XEMBED_FOCUS_CURRENT 0
196# define XEMBED_FOCUS_FIRST 1
197# define XEMBED_FOCUS_LAST 2
198
199# define XEMBED_MAPPED (1 << 0)
200#endif
201
174/* 202/*
175 ***************************************************************************** 203 *****************************************************************************
176 * NORMAL DEFINES 204 * NORMAL DEFINES
177 ***************************************************************************** 205 *****************************************************************************
178 */ 206 */
… …
183# define COLORTERMENVFULL COLORTERMENV "-xpm" 211# define COLORTERMENVFULL COLORTERMENV "-xpm"
184#else 212#else
185# define COLORTERMENVFULL COLORTERMENV 213# define COLORTERMENVFULL COLORTERMENV
186#endif 214#endif
187#ifndef TERMENV 215#ifndef TERMENV
188# define TERMENV "rxvt" 216# define TERMENV "rxvt-unicode"
189#endif 217#endif
190 218
191#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 219#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
192# define NO_MOUSE_REPORT_SCROLLBAR 1 220# define NO_MOUSE_REPORT_SCROLLBAR 1
193#endif 221#endif
… …
228 256
229#define R_SB_ALIGN_CENTRE 0 257#define R_SB_ALIGN_CENTRE 0
230#define R_SB_ALIGN_TOP 1 258#define R_SB_ALIGN_TOP 1
231#define R_SB_ALIGN_BOTTOM 2 259#define R_SB_ALIGN_BOTTOM 2
232 260
233#define R_SB_RXVT 0
234#define R_SB_NEXT 1 261#define R_SB_NEXT 1
235#define R_SB_XTERM 2 262#define R_SB_XTERM 2
236#define R_SB_PLAIN 4 263#define R_SB_PLAIN 4
264#define R_SB_RXVT 8
237 265
238#define SB_WIDTH_NEXT 19 266#define SB_WIDTH_NEXT 19
239#define SB_WIDTH_XTERM 15 267#define SB_WIDTH_XTERM 15
240#define SB_WIDTH_PLAIN 7 268#define SB_WIDTH_PLAIN 7
241#ifndef SB_WIDTH_RXVT 269#ifndef SB_WIDTH_RXVT
… …
323#define FONT_DN "#-" 351#define FONT_DN "#-"
324#define FONT_UP "#+" 352#define FONT_UP "#+"
325 353
326/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
327enum { 355enum {
328 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
329 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
330 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
331}; 359};
332 360
333/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
334enum { 362enum {
335 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
… …
348enum { 376enum {
349 PRIMARY = 0, 377 PRIMARY = 0,
350 SECONDARY, 378 SECONDARY,
351}; 379};
352 380
353#define RS_None 0 /* Normal */ 381#define RS_None 0
354 382
355#define RS_fgMask 0x000001FFUL /* 512 colors */ 383#define RS_fgMask 0x0000007fUL // 128 colors
356#define RS_bgMask 0x0003FE00UL /* 512 colors */ 384#define RS_bgMask 0x00003f80UL // 128 colors
385
386// font styles
357#define RS_Bold 0x00040000UL /* bold */ 387#define RS_Bold 0x00004000UL // value 1
358#define RS_Italic 0x00080000UL 388#define RS_Italic 0x00008000UL // value 2
389
390// fake styles
359#define RS_Blink 0x00100000UL /* blink */ 391#define RS_Blink 0x00010000UL // blink
360#define RS_RVid 0x00200000UL /* reverse video */ 392#define RS_RVid 0x00020000UL // reverse video
361#define RS_Uline 0x00400000UL /* underline */ 393#define RS_Uline 0x00040000UL // underline
362 394
363#define RS_fontCount 512 395// 5 custom bits for extensions
364#define RS_fontMask 0xff800000UL /* plenty(?) of fonts */ 396#define RS_customCount 32
397#define RS_customMask 0x00f80000UL
365#define RS_fontShift 23 398#define RS_customShift 19
366 399
400// other flags
401#define RS_Careful 0x80000000UL /* be careful when drawing these */
402
403#define RS_styleCount 4
404#define RS_styleMask (RS_Bold | RS_Italic)
405#define RS_styleShift 14
406
367#define RS_baseattrMask (RS_Bold|RS_Blink|RS_RVid|RS_Uline) 407#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
368#define RS_attrMask (RS_baseattrMask|RS_fontMask) 408#define RS_attrMask (RS_baseattrMask | RS_fontMask)
409
410#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
411#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
412#define RS_fontShift 24
413
414#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
415#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
369 416
370#define Sel_none 0 /* Not waiting */ 417#define Sel_none 0 /* Not waiting */
371#define Sel_normal 0x01 /* normal selection */ 418#define Sel_normal 0x01 /* normal selection */
372#define Sel_incr 0x02 /* incremental selection */ 419#define Sel_incr 0x02 /* incremental selection */
373#define Sel_direct 0x00 420#define Sel_direct 0x00
… …
418 XTerm_Color_UL = 19, // change actual 'Underline' color 465 XTerm_Color_UL = 19, // change actual 'Underline' color
419 XTerm_Pixmap = 20, // new bg pixmap 466 XTerm_Pixmap = 20, // new bg pixmap
420 XTerm_restoreFG = 39, // change default fg color 467 XTerm_restoreFG = 39, // change default fg color
421 XTerm_restoreBG = 49, // change default bg color 468 XTerm_restoreBG = 49, // change default bg color
422 XTerm_dumpscreen = 55, // dump scrollback and all of screen 469 XTerm_dumpscreen = 55, // dump scrollback and all of screen
470
423 XTerm_locale = 701, // change locale 471 URxvt_locale = 701, // change locale
424 XTerm_findfont = 702, // find font of given character (in decimal)
425 XTerm_Menu = 703, // set menu item 472 URxvt_Menu = 703, // set menu item
473 URxvt_Color_IT = 704, // change actual 'Italic' colour
474 URxvt_Color_tint = 705, // change actual tint colour
475
476 URxvt_font = 710,
477 URxvt_boldFont = 711,
478 URxvt_italicFont = 712,
479 URxvt_boldItalicFont = 713,
480
481 URxvt_view_up = 720,
482 URxvt_view_down = 721,
426}; 483};
427 484
428/* Words starting with `Color_' are colours. Others are counts */ 485/* Words starting with `Color_' are colours. Others are counts */
429/* 486/*
430 * The following comment is mostly obsolete since pixcolor_set was expanded:
431 * We're currently upto 29 colours. Only 3 more available. The
432 * PixColor and rendition colour usage should probably be decoupled 487 * The PixColor and rendition colour usage should probably be decoupled
433 * on the unnecessary items, e.g. Color_pointer, but won't bother 488 * on the unnecessary items, e.g. Color_pointer, but won't bother
434 * until we need to. Also, be aware of usage in pixcolor_set 489 * until we need to. Also, be aware of usage in pixcolor_set
435 */ 490 */
436 491
437enum colour_list { 492enum colour_list {
… …
459 maxBrightCOLOR, /* minBrightCOLOR + 7 */ 514 maxBrightCOLOR, /* minBrightCOLOR + 7 */
460 Color_White = maxBrightCOLOR, 515 Color_White = maxBrightCOLOR,
461#else 516#else
462 Color_White = maxCOLOR, 517 Color_White = maxCOLOR,
463#endif 518#endif
464#ifdef TTY_256COLOR
465 min256COLOR = Color_White + 1, 519 minTermCOLOR = Color_White + 1,
466 max256COLOR = minCOLOR + 255, 520 maxTermCOLOR = Color_White + 72,
467#endif
468#ifndef NO_CURSORCOLOR 521#ifndef NO_CURSORCOLOR
469 Color_cursor, 522 Color_cursor,
470 Color_cursor2, 523 Color_cursor2,
471#endif 524#endif
472 Color_pointer_fg, 525 Color_pointer_fg,
473 Color_pointer_bg, 526 Color_pointer_bg,
474 Color_border, 527 Color_border,
475#ifndef NO_BOLD_UNDERLINE_REVERSE 528#ifndef NO_BOLD_UNDERLINE_REVERSE
476 Color_BD, 529 Color_BD,
530 Color_IT,
477 Color_UL, 531 Color_UL,
478 Color_RV, 532 Color_RV,
533#endif
534#if ENABLE_FRILLS
535 Color_underline,
479#endif 536#endif
480#ifdef OPTION_HC 537#ifdef OPTION_HC
481 Color_HC, 538 Color_HC,
482#endif 539#endif
483#ifdef KEEP_SCROLLCOLOR 540#ifdef KEEP_SCROLLCOLOR
484 Color_scroll, 541 Color_scroll,
485 Color_trough, 542 Color_trough,
486#endif 543#endif
487#if TINTING 544#if TINTING
488 Color_tint, 545 Color_tint,
546#endif
547#if OFF_FOCUS_FADING
548 Color_fade,
489#endif 549#endif
490 NRS_COLORS, /* */ 550 NRS_COLORS, /* */
491#ifdef KEEP_SCROLLCOLOR 551#ifdef KEEP_SCROLLCOLOR
492 Color_topShadow = NRS_COLORS, 552 Color_topShadow = NRS_COLORS,
493 Color_bottomShadow, 553 Color_bottomShadow,
494 TOTAL_COLORS /* upto 30 */ 554 TOTAL_COLORS
495#else 555#else
496 TOTAL_COLORS = NRS_COLORS /* */ 556 TOTAL_COLORS = NRS_COLORS
497#endif 557#endif
498}; 558};
499 559
500#define Color_Bits 9 560#define Color_Bits 7 // 0 .. maxTermCOLOR
561
501#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32) 562#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
502#define NPIXCLR_BITS 32 563#define NPIXCLR_BITS 32
503
504#define DEFAULT_RSTYLE (RS_None | (Color_fg) | (Color_bg<<Color_Bits))
505 564
506/* 565/*
507 * Resource list 566 * Resource list
508 */ 567 */
509enum { 568enum {
… …
513 Rs_geometry, 572 Rs_geometry,
514 Rs_reverseVideo, 573 Rs_reverseVideo,
515 Rs_color, 574 Rs_color,
516 _Rs_color = Rs_color + NRS_COLORS - 1, 575 _Rs_color = Rs_color + NRS_COLORS - 1,
517 Rs_font, 576 Rs_font,
577#if ENABLE_STYLES
578 Rs_boldFont,
579 Rs_italicFont,
580 Rs_boldItalicFont,
581 Rs_intensityStyles,
582#endif
518 Rs_name, 583 Rs_name,
519 Rs_title, 584 Rs_title,
520#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 585#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
521 Rs_path, 586 Rs_path,
522#endif 587#endif
… …
531#ifdef HAVE_SCROLLBARS 596#ifdef HAVE_SCROLLBARS
532 Rs_scrollBar, 597 Rs_scrollBar,
533 Rs_scrollBar_right, 598 Rs_scrollBar_right,
534 Rs_scrollBar_floating, 599 Rs_scrollBar_floating,
535 Rs_scrollBar_align, 600 Rs_scrollBar_align,
536#endif
537 Rs_scrollstyle, /* Rs_scrollBar_style */ 601 Rs_scrollstyle, /* Rs_scrollBar_style */
602 Rs_scrollBar_thickness,
603#endif
538 Rs_scrollTtyOutput, 604 Rs_scrollTtyOutput,
539 Rs_scrollTtyKeypress, 605 Rs_scrollTtyKeypress,
540 Rs_scrollWithBuffer, 606 Rs_scrollWithBuffer,
541 Rs_saveLines, 607 Rs_saveLines,
542 Rs_utmpInhibit, 608 Rs_utmpInhibit,
… …
567#ifdef TRANSPARENT 633#ifdef TRANSPARENT
568 Rs_transparent, 634 Rs_transparent,
569 Rs_transparent_all, 635 Rs_transparent_all,
570#endif 636#endif
571#if ENABLE_FRILLS 637#if ENABLE_FRILLS
638 Rs_pty_fd,
639 Rs_hold,
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_cursorUnderline,
645#endif
646#if CURSOR_BLINK
647 Rs_cursorBlink,
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,
586 Rs_pointerBlank, 657 Rs_pointerBlank,
587 Rs_pointerBlankDelay, 658 Rs_pointerBlankDelay,
588 Rs_imLocale, 659 Rs_imLocale,
660 Rs_imFont,
661 Rs_pastableTabs,
589#ifndef NO_SECONDARY_SCREEN 662#ifndef NO_SECONDARY_SCREEN
590 Rs_secondaryScreen, 663 Rs_secondaryScreen,
591 Rs_secondaryScroll, 664 Rs_secondaryScroll,
592#endif
593#ifndef NO_BOLD_UNDERLINE_REVERSE
594 Rs_realBold,
595#endif 665#endif
596#ifdef OFF_FOCUS_FADING 666#ifdef OFF_FOCUS_FADING
597 Rs_fade, 667 Rs_fade,
598#endif 668#endif
599#ifdef TINTING 669#ifdef TINTING
… …
610 XA_MULTIPLE, 680 XA_MULTIPLE,
611 XA_TARGETS, 681 XA_TARGETS,
612 XA_TIMESTAMP, 682 XA_TIMESTAMP,
613 XA_VT_SELECTION, 683 XA_VT_SELECTION,
614 XA_INCR, 684 XA_INCR,
685 XA_WM_PROTOCOLS,
615 XA_WMDELETEWINDOW, 686 XA_WM_DELETE_WINDOW,
687 XA_CLIPBOARD,
688#if ENABLE_FRILLS
689 XA_MOTIF_WM_HINTS,
690#endif
691#if ENABLE_EWMH
692 XA_NET_WM_PID,
693 XA_NET_WM_NAME,
694 XA_NET_WM_ICON_NAME,
695 XA_NET_WM_PING,
696#endif
697#if USE_XIM
698 XA_WM_LOCALE_NAME,
699#endif
616#ifdef TRANSPARENT 700#if TRANSPARENT
617 XA_XROOTPMAPID, 701 XA_XROOTPMAP_ID,
618 XA_XSETROOTID, 702 XA_ESETROOT_PMAP_ID,
619#endif 703#endif
620#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 704#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
621 XA_DNDPROTOCOL, 705 XA_DNDPROTOCOL,
622 XA_DNDSELECTION, 706 XA_DNDSELECTION,
623#endif /* OFFIX_DND */ 707#endif
624 XA_CLIPBOARD, 708#if ENABLE_XEMBED
709 XA_XEMBED,
710 XA_XEMBED_INFO,
711#endif
625 NUM_XA 712 NUM_XA
626}; 713};
627 714
628/* DEC private modes */ 715/* DEC private modes */
629#define PrivMode_132 (1UL<<0) 716#define PrivMode_132 (1UL<<0)
… …
656 priv_modes |= (bit); \ 743 priv_modes |= (bit); \
657 else \ 744 else \
658 priv_modes &= ~(bit) 745 priv_modes &= ~(bit)
659 746
660#ifdef ALLOW_132_MODE 747#ifdef ALLOW_132_MODE
661# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 748# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
662#else 749#else
663# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 750# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
664#endif 751#endif
665 752
666// do not change these constants lightly, there are many interdependencies 753// do not change these constants lightly, there are many interdependencies
667#define IMBUFSIZ 128 // input modifier buffer sizes 754#define IMBUFSIZ 128 // input modifier buffer sizes
668#define KBUFSZ 512 // size of keyboard mapping buffer 755#define KBUFSZ 512 // size of keyboard mapping buffer
669#define CBUFSIZ 4096 // size of command buffer 756#define CBUFSIZ 2048 // size of command buffer
670#define UBUFSIZ 4096 // character buffer 757#define UBUFSIZ 2048 // character buffer
671 758
672#ifndef PATH_MAX 759#ifndef PATH_MAX
673# define PATH_MAX 16384 760# define PATH_MAX 16384
674#endif 761#endif
675 762
… …
719#define strdup(x) strdup((const char *)(x)) 806#define strdup(x) strdup((const char *)(x))
720#define strlen(x) strlen((const char *)(x)) 807#define strlen(x) strlen((const char *)(x))
721#define strchr(x, y) strchr((const char *)(x), (int)(y)) 808#define strchr(x, y) strchr((const char *)(x), (int)(y))
722#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 809#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
723 810
811#define dDisp Display *disp = display->display
812
724/* convert pixel dimensions to row/column values. Everything as int32_t */ 813/* convert pixel dimensions to row/column values. Everything as int32_t */
725#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 814#define Pixel2Col(x) Pixel2Width((int32_t)(x))
726#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 815#define Pixel2Row(y) Pixel2Height((int32_t)(y))
727#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 816#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
728#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 817#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
729#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 818#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
730#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 819#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
731#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 820#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
732#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 821#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
733 822
734#define TermWin_TotalWidth() ((int32_t)TermWin.width) 823#define TermWin_TotalWidth() ((int32_t)this->width)
735#define TermWin_TotalHeight() ((int32_t)TermWin.height) 824#define TermWin_TotalHeight() ((int32_t)this->height)
825
826// for m >= -n, ensure remainder lies between 0..n-1
827#define MOD(m,n) (((m) + (n)) % (n))
828
829#define LINENO(n) MOD (term_start + int(n), total_rows)
830#define ROW(n) row_buf [LINENO (n)]
736 831
737/* how to build & extract colors and attributes */ 832/* how to build & extract colors and attributes */
738#define GET_BASEFG(x) (((x) & RS_fgMask)) 833#define GET_BASEFG(x) (((x) & RS_fgMask))
739#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 834#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
740#ifndef NO_BRIGHTCOLOR
741# define GET_FGCOLOR(x) \
742 ((((x) & RS_Bold) == 0 \
743 || GET_BASEFG (x) < minCOLOR \
744 || GET_BASEFG (x) >= minBrightCOLOR) \
745 ? GET_BASEFG (x) \
746 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
747# define GET_BGCOLOR(x) \
748 ((((x) & RS_Blink) == 0 \
749 || GET_BASEBG (x) < minCOLOR \
750 || GET_BASEBG (x) >= minBrightCOLOR) \
751 ? GET_BASEBG (x) \
752 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
753#else
754# define GET_FGCOLOR(x) GET_BASEFG(x)
755# define GET_BGCOLOR(x) GET_BASEBG(x)
756#endif
757 835
758#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 836#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
759#define SET_FONT(x,fid) ((x) & ~RS_fontMask) | ((fid) << RS_fontShift) 837#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
838
839#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
840#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
760 841
761#define GET_ATTR(x) (((x) & RS_attrMask)) 842#define GET_ATTR(x) (((x) & RS_attrMask))
762#define GET_BGATTR(x) \ 843#define GET_BGATTR(x) \
763 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 844 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
764 | (((x) & RS_fgMask)<<Color_Bits)) \ 845 | (((x) & RS_fgMask)<<Color_Bits)) \
765 : ((x) & (RS_attrMask | RS_bgMask))) 846 : ((x) & (RS_attrMask | RS_bgMask)))
766#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 847#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
767#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 848#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
768#define SET_ATTR(x,a) (((x) & ~RS_attrMask)| (a)) 849#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
850
851#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
769 852
770#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 853#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
771#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 854#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
855
856#if ENABLE_STYLES
857# define FONTSET(style) fontset[GET_STYLE (style)]
858#else
859# define FONTSET(style) fontset[0]
860#endif
772 861
773#ifdef HAVE_SCROLLBARS 862#ifdef HAVE_SCROLLBARS
774# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 863# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
775#else 864#else
776# define scrollbar_TotalWidth() (0) 865# define scrollbar_TotalWidth() (0)
… …
800#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 889#define scrollbar_size() (scrollBar.end - scrollBar.beg \
801 - scrollbar_minheight ()) 890 - scrollbar_minheight ())
802 891
803#if (MENUBAR_MAX > 1) 892#if (MENUBAR_MAX > 1)
804/* rendition style flags */ 893/* rendition style flags */
805# define menuBar_height() (TermWin.fheight + SHADOW) 894# define menuBar_height() (fheight + SHADOW)
806# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 895# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
807# define isMenuBarWindow(w) ((w) == menuBar.win) 896# define isMenuBarWindow(w) ((w) == menuBar.win)
808#else 897#else
809# define menuBar_height() (0) 898# define menuBar_height() (0)
810# define menuBar_TotalHeight() (0) 899# define menuBar_TotalHeight() (0)
… …
814#ifdef XPM_BACKGROUND 903#ifdef XPM_BACKGROUND
815# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 904# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
816#else 905#else
817# define XPMClearArea(a, b, c, d, e, f, g) 906# define XPMClearArea(a, b, c, d, e, f, g)
818#endif 907#endif
819
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 908
827#ifdef UTMP_SUPPORT 909#ifdef UTMP_SUPPORT
828# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 910# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
829# undef HAVE_UTMPX_H 911# undef HAVE_UTMPX_H
830# undef HAVE_STRUCT_UTMPX 912# undef HAVE_STRUCT_UTMPX
… …
864#endif 946#endif
865 947
866extern class rxvt_failure_exception { } rxvt_failure_exception; 948extern class rxvt_failure_exception { } rxvt_failure_exception;
867 949
868typedef callback1<void, const char *> log_callback; 950typedef callback1<void, const char *> log_callback;
951typedef callback1<int, int> getfd_callback;
869 952
870extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 953extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
871extern void rxvt_log (const char *fmt, ...); 954extern void rxvt_log (const char *fmt, ...);
872extern void rxvt_warn (const char *fmt, ...); 955extern void rxvt_warn (const char *fmt, ...);
873extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 956extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
903 986
904 operator mbstate_t *() { return &mbs; } 987 operator mbstate_t *() { return &mbs; }
905 void reset () { memset (&mbs, 0, sizeof (mbs)); } 988 void reset () { memset (&mbs, 0, sizeof (mbs)); }
906 mbstate () { reset (); } 989 mbstate () { reset (); }
907}; 990};
991
992#define UNICODE_MASK 0x1fffffUL
908 993
909#if UNICODE3 994#if UNICODE3
910# define COMPOSE_LO 0x40000000UL 995# define COMPOSE_LO 0x40000000UL
911# define COMPOSE_HI 0x400fffffUL 996# define COMPOSE_HI 0x400fffffUL
912# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 997# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
942 1027
943extern class rxvt_composite_vec rxvt_composite; 1028extern class rxvt_composite_vec rxvt_composite;
944#endif 1029#endif
945 1030
946 1031
1032#ifdef KEYSYM_RESOURCE
1033 class keyboard_manager;
1034#endif
1035
947struct rxvt_term : rxvt_vars { 1036struct rxvt_term : zero_initialized, rxvt_vars {
948 log_callback *log_hook; // log error messages through this hook, if != 0 1037 log_callback *log_hook; // log error messages through this hook, if != 0
1038 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
949 1039
950 struct mbstate mbstate; // current input multibyte state 1040 struct mbstate mbstate; // current input multibyte state
951 1041
952 unsigned char want_refresh:1, 1042 unsigned char want_refresh:1,
953#ifdef TRANSPARENT 1043#ifdef TRANSPARENT
… …
968 hidden_text:1, 1058 hidden_text:1,
969#endif 1059#endif
970#ifdef POINTER_BLANK 1060#ifdef POINTER_BLANK
971 hidden_pointer:1, 1061 hidden_pointer:1,
972#endif 1062#endif
973// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1063 enc_utf8:1, /* wether locale uses utf-8 */
974 seen_input:1, /* wether we have seen some program output yet */ 1064 seen_input:1, /* wether we have seen some program output yet */
1065 seen_resize:1, /* wether we had a resize event */
975 parsed_geometry:1; 1066 parsed_geometry:1;
976 1067
977 unsigned char refresh_type, 1068 unsigned char refresh_type,
978#ifdef META8_OPTION 1069#ifdef META8_OPTION
979 meta_char, /* Alt-key prefix */ 1070 meta_char, /* Alt-key prefix */
… …
981 scrollbar_align, 1072 scrollbar_align,
982 selection_wait, 1073 selection_wait,
983 selection_type; 1074 selection_type;
984/* ---------- */ 1075/* ---------- */
985 short rvideo; 1076 short rvideo;
986 int16_t num_scr; /* screen: number lines scrolled */ 1077 int num_scr; /* screen: number lines scrolled */
987 unsigned int prev_ncol, /* screen: previous number of columns */ 1078 int prev_ncol, /* screen: previous number of columns */
988 prev_nrow; /* screen: previous number of rows */ 1079 prev_nrow; /* screen: previous number of rows */
989/* ---------- */ 1080/* ---------- */
990 rend_t rstyle; 1081 rend_t rstyle;
991/* ---------- */ 1082/* ---------- */
992 uint32_t pixcolor_set[NPIXCLR_SETS]; 1083 uint32_t pixcolor_set[NPIXCLR_SETS];
… …
1023# ifdef POINTER_BLANK 1114# ifdef POINTER_BLANK
1024 pointerBlankDelay, 1115 pointerBlankDelay,
1025# endif 1116# endif
1026 allowedxerror; 1117 allowedxerror;
1027/* ---------- */ 1118/* ---------- */
1028 unsigned int ModMetaMask, 1119 unsigned int ModLevel3Mask,
1120 ModMetaMask,
1029 ModNumLockMask, 1121 ModNumLockMask;
1030#ifndef NO_BRIGHTCOLOR
1031 colorfgbg,
1032#endif
1033 old_width, /* last used width in screen resize */ 1122 int old_width, /* last used width in screen resize */
1034 old_height; /* last used height in screen resize */ 1123 old_height; /* last used height in screen resize */
1035 unsigned long priv_modes, 1124 unsigned long priv_modes,
1036 SavedModes; 1125 SavedModes;
1037/* ---------- */ 1126/* ---------- */
1038 Atom xa[NUM_XA]; 1127 Atom xa[NUM_XA];
… …
1066#endif 1155#endif
1067/* ---------- */ 1156/* ---------- */
1068 Time selection_time, 1157 Time selection_time,
1069 selection_request_time; 1158 selection_request_time;
1070 pid_t cmd_pid; /* process id of child */ 1159 pid_t cmd_pid; /* process id of child */
1160 char * incr_buf;
1161 size_t incr_buf_size, incr_buf_fill;
1071/* ---------- */ 1162/* ---------- */
1072 Cursor leftptr_cursor; 1163 Cursor leftptr_cursor;
1073#ifdef POINTER_BLANK
1074 Cursor blank_cursor;
1075#endif
1076/* ---------- */ 1164/* ---------- */
1077#ifndef NO_BACKSPACE_KEY 1165#ifndef NO_BACKSPACE_KEY
1078 const char *key_backspace; 1166 const char *key_backspace;
1079#endif 1167#endif
1080#ifndef NO_DELETE_KEY 1168#ifndef NO_DELETE_KEY
1081 const char *key_delete; 1169 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 1170#endif
1088 struct mouse_event MEvent; 1171 struct mouse_event MEvent;
1089 XComposeStatus compose; 1172 XComposeStatus compose;
1090 ttymode_t tio; 1173 ttymode_t tio;
1091#ifdef UTMP_SUPPORT 1174#ifdef UTMP_SUPPORT
… …
1128 void scr_swap_overlay (); 1211 void scr_swap_overlay ();
1129 void scr_overlay_new (int x, int y, int w, int h); 1212 void scr_overlay_new (int x, int y, int w, int h);
1130 void scr_overlay_off (); 1213 void scr_overlay_off ();
1131 void scr_overlay_set (int x, int y, 1214 void scr_overlay_set (int x, int y,
1132 text_t text, 1215 text_t text,
1133 rend_t rend = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg)); 1216 rend_t rend = OVERLAY_RSTYLE);
1134 void scr_overlay_set (int x, int y, const char *s); 1217 void scr_overlay_set (int x, int y, const char *s);
1218 void scr_overlay_set (int x, int y, const wchar_t *s);
1135#endif 1219#endif
1136 1220
1137 vector<void *> allocated; // free these memory blocks with free() 1221 vector<void *> allocated; // free these memory blocks with free()
1138 1222
1139 char *env_windowid; /* environmental variable WINDOWID */ 1223 char *env_windowid; /* environmental variable WINDOWID */
1140 char *env_display; /* environmental variable DISPLAY */ 1224 char *env_display; /* environmental variable DISPLAY */
1141 char *env_term; /* environmental variable TERM */ 1225 char *env_term; /* environmental variable TERM */
1142 char *env_colorfgbg; 1226 char *env_colorfgbg;
1143 char *locale; 1227 char *locale;
1144#if 0
1145 char *codeset;
1146#endif
1147 char charsets[4]; 1228 char charsets[4];
1148 unsigned char *v_buffer; /* pointer to physical buffer */ 1229 unsigned char *v_buffer; /* pointer to physical buffer */
1149 unsigned int v_buflen; /* size of area to write */ 1230 unsigned int v_buflen; /* size of area to write */
1150 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1231 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1232
1151#ifdef KEYSYM_RESOURCE 1233#ifdef KEYSYM_RESOURCE
1152 const unsigned char *Keysym_map[256]; 1234 keyboard_manager *keyboard;
1153#endif 1235#endif
1236
1154 const char *rs[NUM_RESOURCES]; 1237 const char *rs[NUM_RESOURCES];
1155 /* command input buffering */ 1238 /* command input buffering */
1156 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1239 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1157 unsigned char cmdbuf_base[CBUFSIZ]; 1240 unsigned char cmdbuf_base[CBUFSIZ];
1158 1241
… …
1165 // ISO 14755 entry support 1248 // ISO 14755 entry support
1166 unicode_t iso14755buf; 1249 unicode_t iso14755buf;
1167 void commit_iso14755 (); 1250 void commit_iso14755 ();
1168 int hex_keyval (XKeyEvent &ev); 1251 int hex_keyval (XKeyEvent &ev);
1169# if ISO_14755 1252# if ISO_14755
1170 void iso14755_51 (wchar_t ch); 1253 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1171 void iso14755_54 (int x, int y); 1254 void iso14755_54 (int x, int y);
1172# endif 1255# endif
1173#endif 1256#endif
1174 1257
1258 // modifies first argument(!)
1175 void paste (const unsigned char *data, unsigned int len); 1259 void paste (unsigned char *data, unsigned int len);
1176 1260
1177 void flush (); 1261 void flush ();
1178 1262
1179#if TRANSPARENT 1263#if TRANSPARENT
1180 void rootwin_cb (XEvent &xev); 1264 void rootwin_cb (XEvent &xev);
… …
1222#endif 1306#endif
1223 void pointer_unblank (); 1307 void pointer_unblank ();
1224 1308
1225 void tt_printf (const char *fmt,...); 1309 void tt_printf (const char *fmt,...);
1226 void tt_write (const unsigned char *data, unsigned int len); 1310 void tt_write (const unsigned char *data, unsigned int len);
1311 void pty_write ();
1227 1312
1228 void tt_winch (); 1313 void tt_winch ();
1229 1314
1230 rxvt_term (); 1315 rxvt_term ();
1231 ~rxvt_term (); 1316 ~rxvt_term ();
1317 void child_exit (); // child has exited, usually destroys
1232 void destroy (); 1318 void destroy ();
1319 void emergency_cleanup ();
1233 1320
1234 bool init (int argc, const char *const *argv); 1321 bool init (int argc, const char *const *argv);
1235 bool init_vars (); 1322 bool init_vars ();
1236 1323
1237 bool pty_fill (); 1324 bool pty_fill ();
1238
1239 void *operator new (size_t s);
1240 void operator delete (void *p, size_t s);
1241 1325
1242 void init_secondary (); 1326 void init_secondary ();
1243 const char **init_resources (int argc, const char *const *argv); 1327 const char **init_resources (int argc, const char *const *argv);
1244 void init_env (); 1328 void init_env ();
1245 void set_locale (const char *locale); 1329 void set_locale (const char *locale);
1246 void init_xlocale (); 1330 void init_xlocale ();
1247 void init_command (const char *const *argv); 1331 void init_command (const char *const *argv);
1248 void run_command (const char *const *argv); 1332 void run_command (const char *const *argv);
1249 int run_child (const char *const *argv); 1333 int run_child (const char *const *argv);
1250 static void child_exited (int pid);
1251 1334
1252 void color_aliases (int idx); 1335 void color_aliases (int idx);
1253 void recolour_cursor (); 1336 void recolour_cursor ();
1254 void create_windows (int argc, const char *const *argv); 1337 void create_windows (int argc, const char *const *argv);
1255 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1338 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1256 void window_calc (unsigned int width, unsigned int height); 1339 void window_calc (unsigned int newwidth, unsigned int newheight);
1257 1340
1258#if USE_XIM 1341#if USE_XIM
1342 rxvt_xim *input_method;
1343 XIC Input_Context;
1344 XIMStyle input_style;
1345 XPoint spot; // most recently sent spot position
1346
1259 void im_destroy (); 1347 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1348 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1349 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos); 1350 void im_set_position (XPoint &pos);
1263 void im_set_color (unsigned long &fg, unsigned long &bg); 1351 void im_set_color (unsigned long &fg, unsigned long &bg);
… …
1290 1378
1291 bool cmd_parse (); 1379 bool cmd_parse ();
1292 void mouse_report (XButtonEvent &ev); 1380 void mouse_report (XButtonEvent &ev);
1293 void button_press (XButtonEvent &ev); 1381 void button_press (XButtonEvent &ev);
1294 void button_release (XButtonEvent &ev); 1382 void button_release (XButtonEvent &ev);
1383 void focus_in ();
1384 void focus_out ();
1295 int check_our_parents (); 1385 int check_our_parents ();
1296#ifdef PRINTPIPE 1386#ifdef PRINTPIPE
1297 FILE *popen_printer (); 1387 FILE *popen_printer ();
1298 int pclose_printer (FILE *stream); 1388 int pclose_printer (FILE *stream);
1299#endif 1389#endif
… …
1318 // logging.C 1408 // logging.C
1319 void makeutent (const char *pty, const char *hostname); 1409 void makeutent (const char *pty, const char *hostname);
1320 void cleanutent (); 1410 void cleanutent ();
1321 // main.C 1411 // main.C
1322 void privileged_utmp (rxvt_privaction action); 1412 void privileged_utmp (rxvt_privaction action);
1323 bool change_font (const char *fontname); 1413 bool set_fonts ();
1324 bool font_up_down (int n, int direction); 1414 void set_string_property (Atom prop, const char *str, int len = -1);
1415 void set_utf8_property (Atom prop, const char *str, int len = -1);
1325 void set_title (const char *str); 1416 void set_title (const char *str);
1326 void set_icon_name (const char *str); 1417 void set_icon_name (const char *str);
1327 void set_window_color (int idx, const char *color); 1418 void set_window_color (int idx, const char *color);
1328 void set_colorfgbg (); 1419 void set_colorfgbg ();
1329 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1420 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1330 void set_widthheight (unsigned int width, unsigned int height); 1421 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1331 1422
1332#ifdef MENUBAR 1423#ifdef MENUBAR
1333 // menubar.C 1424 // menubar.C
1334 void menuitem_free (menu_t *menu, menuitem_t *item); 1425 void menuitem_free (menu_t *menu, menuitem_t *item);
1335 int action_dispatch (action_t *action); 1426 int action_dispatch (action_t *action);
… …
1361 void menubar_control (XButtonEvent &ev); 1452 void menubar_control (XButtonEvent &ev);
1362 void map_menuBar (int map); 1453 void map_menuBar (int map);
1363#endif 1454#endif
1364 1455
1365 // screen.C 1456 // screen.C
1366 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1457
1367 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1458 void lalloc (line_t &l)
1459 {
1460 l.t = (text_t *)talloc->alloc ();
1461 l.r = (rend_t *)ralloc->alloc ();
1462 }
1463
1464#if 0
1465 void lfree (line_t &l)
1466 {
1467 talloc->free (l.t);
1468 ralloc->free (l.r);
1469 }
1470#endif
1471
1472 void lresize (line_t &l)
1473 {
1474 if (!l.t)
1475 return;
1476
1477 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1478 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1479
1480 l.l = min (l.l, ncol);
1481
1482 if (ncol > prev_ncol)
1483 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1484 }
1485
1486 int fgcolor_of (rend_t r)
1487 {
1488 int base = GET_BASEFG (r);
1489#ifndef NO_BRIGHTCOLOR
1490 if (r & RS_Bold
1491# if ENABLE_STYLES
1492 && OPTION (Opt_intensityStyles)
1493# endif
1494 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1495 base += minBrightCOLOR - minCOLOR;
1496#endif
1497 return base;
1498 }
1499
1500 int bgcolor_of (rend_t r)
1501 {
1502 int base = GET_BASEBG (r);
1503#ifndef NO_BRIGHTCOLOR
1504 if (r & RS_Blink
1505# if ENABLE_STYLES
1506 && OPTION (Opt_intensityStyles)
1507# endif
1508 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1509 base += minBrightCOLOR - minCOLOR;
1510#endif
1511 return base;
1512 }
1513
1514 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1515 void scr_blank_screen_mem (line_t &l, rend_t efs);
1368 int scr_scroll_text (int row1, int row2, int count, int spec); 1516 int scr_scroll_text (int row1, int row2, int count);
1369 void scr_reset (); 1517 void scr_reset ();
1370 void scr_reset_realloc ();
1371 void scr_release (); 1518 void scr_release ();
1372 void scr_clear (bool really = false); 1519 void scr_clear (bool really = false);
1373 void scr_refresh (unsigned char refresh_type); 1520 void scr_refresh (unsigned char refresh_type);
1374 bool scr_refresh_rend (rend_t mask, rend_t value); 1521 bool scr_refresh_rend (rend_t mask, rend_t value);
1375 void scr_erase_screen (int mode); 1522 void scr_erase_screen (int mode);
1523#if ENABLE_FRILLS
1524 void scr_erase_savelines ();
1525 void scr_backindex ();
1526 void scr_forwardindex ();
1527#endif
1376 void scr_touch (bool refresh); 1528 void scr_touch (bool refresh);
1377 void scr_expose (int x, int y, int width, int height, bool refresh); 1529 void scr_expose (int x, int y, int width, int height, bool refresh);
1530 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1531 void scr_recolour ();
1378 void scr_remap_chars (); 1532 void scr_remap_chars ();
1379 void scr_remap_chars (text_t *tp, rend_t *rp); 1533 void scr_remap_chars (const line_t &l);
1380 1534
1381 void scr_poweron (); 1535 void scr_poweron ();
1382 void scr_cursor (int mode); 1536 void scr_cursor (int mode);
1383 void scr_do_wrap (); 1537 void scr_do_wrap ();
1384 int scr_change_screen (int scrn); 1538 int scr_change_screen (int scrn);
1385 void scr_color (unsigned int color, int fgbg); 1539 void scr_color (unsigned int color, int fgbg);
1386 void scr_rendition (int set, int style); 1540 void scr_rendition (int set, int style);
1387 void scr_add_lines (const unicode_t *str, int nlines, int len); 1541 void scr_add_lines (const unicode_t *str, int nlines, int len);
1388 void scr_backspace (); 1542 void scr_backspace ();
1389 void scr_tab (int count); 1543 void scr_tab (int count, bool ht = false);
1390 void scr_backindex ();
1391 void scr_forwardindex ();
1392 void scr_gotorc (int row, int col, int relative); 1544 void scr_gotorc (int row, int col, int relative);
1393 void scr_index (enum page_dirn direction); 1545 void scr_index (enum page_dirn direction);
1394 void scr_erase_line (int mode); 1546 void scr_erase_line (int mode);
1395 void scr_E (); 1547 void scr_E ();
1396 void scr_insdel_lines (int count, int insdel); 1548 void scr_insdel_lines (int count, int insdel);
… …
1406 void set_font_style (); 1558 void set_font_style ();
1407 void scr_charset_choose (int set); 1559 void scr_charset_choose (int set);
1408 void scr_charset_set (int set, unsigned int ch); 1560 void scr_charset_set (int set, unsigned int ch);
1409 int scr_move_to (int y, int len); 1561 int scr_move_to (int y, int len);
1410 int scr_page (enum page_dirn direction, int nlines); 1562 int scr_page (enum page_dirn direction, int nlines);
1411 int scr_changeview (uint16_t oldviewstart); 1563 int scr_changeview (unsigned int oldviewstart);
1412 void scr_bell (); 1564 void scr_bell ();
1413 void scr_printscreen (int fullhist); 1565 void scr_printscreen (int fullhist);
1414 void scr_reverse_selection (); 1566 void scr_reverse_selection ();
1415 void scr_dump (int fd); 1567 void scr_dump (int fd);
1416 void selection_check (int check_more); 1568 void selection_check (int check_more);
1417 int selection_paste (Window win, Atom prop, bool delete_prop); 1569 void selection_paste (Window win, Atom prop, bool delete_prop);
1418 void selection_property (Window win, Atom prop); 1570 void selection_property (Window win, Atom prop);
1419 void selection_request (Time tm, int x, int y); 1571 void selection_request (Time tm, int x, int y);
1420 int selection_request_other (Atom target, int selnum); 1572 int selection_request_other (Atom target, int selnum);
1421 void selection_clear (); 1573 void selection_clear ();
1422 void selection_make (Time tm); 1574 void selection_make (Time tm);
… …
1457 1609
1458 // xdefaults.C 1610 // xdefaults.C
1459 void get_options (int argc, const char *const *argv); 1611 void get_options (int argc, const char *const *argv);
1460 int parse_keysym (const char *str, const char *arg); 1612 int parse_keysym (const char *str, const char *arg);
1461 void get_xdefaults (FILE *stream, const char *name); 1613 void get_xdefaults (FILE *stream, const char *name);
1462 void extract_resources (Display *display, const char *name); 1614 void extract_resources ();
1463 // xpm.C 1615 // xpm.C
1464 int scale_pixmap (const char *geom); 1616 int scale_pixmap (const char *geom);
1465 void resize_pixmap (); 1617 void resize_pixmap ();
1466 Pixmap set_bgPixmap (const char *file); 1618 Pixmap set_bgPixmap (const char *file);
1467}; 1619};

Diff Legend

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