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.140 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.197 by root, Wed Jan 11 05:29:40 2006 UTC

… …
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#include "rxvtperl.h"
25
26#if ENABLE_FRILLS
27# define ENABLE_XEMBED 1
28# define ENABLE_EWMH 1
29# define CURSOR_BLINK 1
30#endif
23 31
24/* 32/*
25 ***************************************************************************** 33 *****************************************************************************
26 * SYSTEM HACKS 34 * SYSTEM HACKS
27 ***************************************************************************** 35 *****************************************************************************
… …
66# define STDIN_FILENO 0 74# define STDIN_FILENO 0
67# define STDOUT_FILENO 1 75# define STDOUT_FILENO 1
68# define STDERR_FILENO 2 76# define STDERR_FILENO 2
69#endif 77#endif
70 78
71#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
72# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
73# define NO_SETOWNER_TTYDEV 1
74# endif
75#endif
76#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
77# define NO_SETOWNER_TTYDEV 1
78#endif
79
80/* 79/*
81 ***************************************************************************** 80 *****************************************************************************
82 * PROTOTYPES 81 * PROTOTYPES
83 ***************************************************************************** 82 *****************************************************************************
84 */ 83 */
84// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 85RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 86RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 87void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 88void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 89void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 90void * rxvt_realloc (void *ptr, size_t size);
91void rxvt_privileges (rxvt_privaction action);
92
93// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len = -1); 94char * rxvt_wcstombs (const wchar_t *str, int len = -1);
92wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 95wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
93char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 96char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
94wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 97wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
95char * rxvt_strdup (const char *str); 98char * rxvt_strdup (const char *str);
99
100// misc.C
96char * rxvt_r_basename (const char *str); 101char * rxvt_r_basename (const char *str);
97void rxvt_vlog (const char *fmt, va_list arg_ptr); 102void rxvt_vlog (const char *fmt, va_list arg_ptr);
98void rxvt_log (const char *fmt,...); 103void rxvt_log (const char *fmt,...);
99void rxvt_warn (const char *fmt,...); 104void rxvt_warn (const char *fmt,...);
100void rxvt_fatal (const char *fmt,...); 105void rxvt_fatal (const char *fmt,...);
… …
106char ** rxvt_splitcommastring (const char *cs); 111char ** rxvt_splitcommastring (const char *cs);
107void rxvt_freecommastring (char **cs); 112void rxvt_freecommastring (char **cs);
108char * rxvt_File_find (const char *file, const char *ext, const char *path); 113char * rxvt_File_find (const char *file, const char *ext, const char *path);
109void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 114void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
110void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 115void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
111 116void rxvt_usleep (int usecs);
112void rxvt_privileges (rxvt_privaction action);
113 117
114/* 118/*
115 ***************************************************************************** 119 *****************************************************************************
116 * STRUCTURES AND TYPEDEFS 120 * STRUCTURES AND TYPEDEFS
117 ***************************************************************************** 121 *****************************************************************************
… …
127#endif 131#endif
128 132
129/* If we're using either the rxvt scrollbar or menu bars, keep the 133/* If we're using either the rxvt scrollbar or menu bars, keep the
130 * scrollColor resource. 134 * scrollColor resource.
131 */ 135 */
132#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 136#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
133# define KEEP_SCROLLCOLOR 1 137# define KEEP_SCROLLCOLOR 1
134#else 138#else
135# undef KEEP_SCROLLCOLOR 139# undef KEEP_SCROLLCOLOR
136#endif 140#endif
137 141
… …
151 Time time; /* milliseconds */ 155 Time time; /* milliseconds */
152 unsigned int state; /* key or button mask */ 156 unsigned int state; /* key or button mask */
153 unsigned int button; /* detail */ 157 unsigned int button; /* detail */
154}; 158};
155 159
156#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
157#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
158#define SWAP_IT(one, two, typeof) \
159 do { \
160 typeof swapittmp; \
161 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
162 } while (/* CONSTCOND */ 0)
163#define BOUND_POSITIVE_INT16(val) \
164 (int16_t) ((val) <= 0 \
165 ? 0 \
166 : min ((val), (((uint16_t)-1)>>1)))
167
168#if ENABLE_FRILLS 160#if ENABLE_FRILLS
169typedef struct _mwmhints { 161typedef struct _mwmhints {
170 CARD32 flags; 162 CARD32 flags;
171 CARD32 functions; 163 CARD32 functions;
172 CARD32 decorations; 164 CARD32 decorations;
173 INT32 input_mode; 165 INT32 input_mode;
174 CARD32 status; 166 CARD32 status;
175} MWMHints; 167} MWMHints;
176#endif 168#endif
177 169
170#if ENABLE_XEMBED
171// XEMBED messages
172# define XEMBED_EMBEDDED_NOTIFY 0
173# define XEMBED_WINDOW_ACTIVATE 1
174# define XEMBED_WINDOW_DEACTIVATE 2
175# define XEMBED_REQUEST_FOCUS 3
176# define XEMBED_FOCUS_IN 4
177# define XEMBED_FOCUS_OUT 5
178# define XEMBED_FOCUS_NEXT 6
179# define XEMBED_FOCUS_PREV 7
180
181# define XEMBED_MODALITY_ON 10
182# define XEMBED_MODALITY_OFF 11
183# define XEMBED_REGISTER_ACCELERATOR 12
184# define XEMBED_UNREGISTER_ACCELERATOR 13
185# define XEMBED_ACTIVATE_ACCELERATOR 14
186
187// XEMBED detail code
188# define XEMBED_FOCUS_CURRENT 0
189# define XEMBED_FOCUS_FIRST 1
190# define XEMBED_FOCUS_LAST 2
191
192# define XEMBED_MAPPED (1 << 0)
193#endif
194
178/* 195/*
179 ***************************************************************************** 196 *****************************************************************************
180 * NORMAL DEFINES 197 * NORMAL DEFINES
181 ***************************************************************************** 198 *****************************************************************************
182 */ 199 */
… …
194 211
195#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
196# define NO_MOUSE_REPORT_SCROLLBAR 1 213# define NO_MOUSE_REPORT_SCROLLBAR 1
197#endif 214#endif
198 215
199#ifdef NO_RESOURCES 216#if defined (ISO_14755) || defined (ENABLE_PERL)
200# undef USE_XGETDEFAULT
201#endif
202
203#if ISO_14755
204# define ENABLE_OVERLAY 1 217# define ENABLE_OVERLAY 1
205#endif 218#endif
206 219
207/* now look for other badly set stuff */ 220/* now look for other badly set stuff */
208 221
… …
223# define HAVE_SCROLLBARS 1 236# define HAVE_SCROLLBARS 1
224#endif 237#endif
225 238
226/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 239/* width of scrollBar, menuBar shadow, must be 1 or 2 */
227#ifdef HALFSHADOW 240#ifdef HALFSHADOW
228# define SHADOW 1 241# define MENU_SHADOW 1
229#else 242#else
230# define SHADOW 2 243# define MENU_SHADOW 2
231#endif 244#endif
232 245
233#define R_SB_ALIGN_CENTRE 0 246#define R_SB_ALIGN_CENTRE 0
234#define R_SB_ALIGN_TOP 1 247#define R_SB_ALIGN_TOP 1
235#define R_SB_ALIGN_BOTTOM 2 248#define R_SB_ALIGN_BOTTOM 2
236 249
237#define R_SB_RXVT 0
238#define R_SB_NEXT 1 250#define R_SB_NEXT 1
239#define R_SB_XTERM 2 251#define R_SB_XTERM 2
240#define R_SB_PLAIN 4 252#define R_SB_PLAIN 4
253#define R_SB_RXVT 8
241 254
242#define SB_WIDTH_NEXT 19 255#define SB_WIDTH_NEXT 19
243#define SB_WIDTH_XTERM 15 256#define SB_WIDTH_XTERM 15
244#define SB_WIDTH_PLAIN 7 257#define SB_WIDTH_PLAIN 7
245#ifndef SB_WIDTH_RXVT 258#ifndef SB_WIDTH_RXVT
… …
327#define FONT_DN "#-" 340#define FONT_DN "#-"
328#define FONT_UP "#+" 341#define FONT_UP "#+"
329 342
330/* flags for rxvt_scr_gotorc () */ 343/* flags for rxvt_scr_gotorc () */
331enum { 344enum {
332 C_RELATIVE = 1 , /* col movement is relative */ 345 C_RELATIVE = 1, /* col movement is relative */
333 R_RELATIVE = 2, /* row movement is relative */ 346 R_RELATIVE = 2, /* row movement is relative */
334 RELATIVE = 1 | 2, 347 RELATIVE = C_RELATIVE | R_RELATIVE,
335}; 348};
336 349
337/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 350/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
338enum { 351enum {
339 INSERT = -1, /* don't change these values */ 352 INSERT = -1, /* don't change these values */
… …
352enum { 365enum {
353 PRIMARY = 0, 366 PRIMARY = 0,
354 SECONDARY, 367 SECONDARY,
355}; 368};
356 369
357#define RS_None 0 /* Normal */ 370#define RS_None 0
358 371
359#define RS_fgMask 0x0000007fUL /* 128 colors */ 372#define RS_fgMask 0x0000007fUL // 128 colors
360#define RS_bgMask 0x00003f80UL /* 128 colors */ 373#define RS_bgMask 0x00003f80UL // 128 colors
361 374
362// font styles 375// font styles
363#define RS_Bold 0x00004000UL // value 1 376#define RS_Bold 0x00004000UL // value 1
364#define RS_Italic 0x00008000UL // value 2 377#define RS_Italic 0x00008000UL // value 2
365 378
366// fake styles 379// fake styles
367#define RS_Blink 0x00010000UL /* blink */ 380#define RS_Blink 0x00010000UL // blink
368#define RS_RVid 0x00020000UL /* reverse video */ 381#define RS_RVid 0x00020000UL // reverse video
369#define RS_Uline 0x00040000UL /* underline */ 382#define RS_Uline 0x00040000UL // underline
370 383
371// 5 bits still to go 384// 5 custom bits for extensions
385#define RS_customCount 32
386#define RS_customMask 0x00f80000UL
387#define RS_customShift 19
372 388
373// other flags 389// other flags
374#define RS_Careful 0x80000000UL /* be careful when drawing these */ 390#define RS_Careful 0x80000000UL /* be careful when drawing these */
375 391
376#define RS_styleCount 4 392#define RS_styleCount 4
… …
418 XTerm_property = 3, // change X property 434 XTerm_property = 3, // change X property
419 XTerm_Color = 4, // change colors 435 XTerm_Color = 4, // change colors
420 XTerm_Color00 = 10, // not implemented, CLASH! 436 XTerm_Color00 = 10, // not implemented, CLASH!
421 XTerm_Color01 = 11, // not implemented 437 XTerm_Color01 = 11, // not implemented
422 XTerm_Color_cursor = 12, // change actual 'Cursor' color 438 XTerm_Color_cursor = 12, // change actual 'Cursor' color
423 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 439 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
424 XTerm_Color_pointer_bg = 14, // not implemented 440 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
425 XTerm_Color05 = 15, // not implemented 441 XTerm_Color05 = 15, // not implemented (tektronix fg)
426 XTerm_Color06 = 16, // not implemented 442 XTerm_Color06 = 16, // not implemented (tektronix bg)
427 XTerm_Color_RV = 17, // change actual 'Highlight' color 443 XTerm_Color_RV = 17, // change actual 'Highlight' color
428 XTerm_logfile = 46, // not implemented 444 XTerm_logfile = 46, // not implemented
429 XTerm_font = 50, 445 XTerm_font = 50,
430 446
431 XTerm_konsole30 = 30, // reserved for konsole 447 XTerm_konsole30 = 30, // reserved for konsole
432 XTerm_konsole31 = 31, // reserved for konsole 448 XTerm_konsole31 = 31, // reserved for konsole
433 XTerm_emacs51 = 51, // reserved for emacs shell 449 XTerm_emacs51 = 51, // reserved for emacs shell
434 /* 450 /*
435 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 451 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
452 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
436 */ 453 */
437 XTerm_Color_BD = 18, // change actual 'Bold' color 454 Rxvt_Color_BD = 18, // change actual 'Bold' color
438 XTerm_Color_UL = 19, // change actual 'Underline' color 455 Rxvt_Color_UL = 19, // change actual 'Underline' color
439 XTerm_Pixmap = 20, // new bg pixmap 456 Rxvt_Pixmap = 20, // new bg pixmap
440 XTerm_restoreFG = 39, // change default fg color 457 Rxvt_restoreFG = 39, // change default fg color
441 XTerm_restoreBG = 49, // change default bg color 458 Rxvt_restoreBG = 49, // change default bg color
442 XTerm_dumpscreen = 55, // dump scrollback and all of screen 459 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
460
443 XTerm_locale = 701, // change locale 461 URxvt_locale = 701, // change locale
444 XTerm_Menu = 703, // set menu item 462 URxvt_Menu = 703, // set menu item
445 XTerm_Color_IT = 704, // change actual 'Italic' colour 463 URxvt_Color_IT = 704, // change actual 'Italic' colour
446 XTerm_Color_tint = 705, // change actual tint colour 464 URxvt_Color_tint = 705, // change actual tint colour
465 URxvt_Color_BD = 706,
466 URxvt_Color_UL = 707,
447 467
448 URxvt_font = 710, 468 URxvt_font = 710,
449 URxvt_boldFont = 711, 469 URxvt_boldFont = 711,
450 URxvt_italicFont = 712, 470 URxvt_italicFont = 712,
451 URxvt_boldItalicFont = 713, 471 URxvt_boldItalicFont = 713,
472
473 URxvt_view_up = 720,
474 URxvt_view_down = 721,
475
476 URxvt_perl = 777,
452}; 477};
453 478
454/* Words starting with `Color_' are colours. Others are counts */ 479/* Words starting with `Color_' are colours. Others are counts */
455/* 480/*
456 * The following comment is mostly obsolete since pixcolor_set was expanded:
457 * We're currently upto 29 colours. Only 3 more available. The
458 * PixColor and rendition colour usage should probably be decoupled 481 * The PixColor and rendition colour usage should probably be decoupled
459 * on the unnecessary items, e.g. Color_pointer, but won't bother 482 * on the unnecessary items, e.g. Color_pointer, but won't bother
460 * until we need to. Also, be aware of usage in pixcolor_set 483 * until we need to. Also, be aware of usage in pixcolor_set
461 */ 484 */
462 485
463enum colour_list { 486enum colour_list {
… …
513 Color_trough, 536 Color_trough,
514#endif 537#endif
515#if TINTING 538#if TINTING
516 Color_tint, 539 Color_tint,
517#endif 540#endif
541#if OFF_FOCUS_FADING
542 Color_fade,
543#endif
518 NRS_COLORS, /* */ 544 NRS_COLORS, /* */
519#ifdef KEEP_SCROLLCOLOR 545#ifdef KEEP_SCROLLCOLOR
520 Color_topShadow = NRS_COLORS, 546 Color_topShadow = NRS_COLORS,
521 Color_bottomShadow, 547 Color_bottomShadow,
522 TOTAL_COLORS 548 TOTAL_COLORS
… …
532 558
533/* 559/*
534 * Resource list 560 * Resource list
535 */ 561 */
536enum { 562enum {
537 Rs_display_name = 0, 563# define def(name) Rs_ ## name,
538 Rs_term_name, 564# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
539 Rs_iconName, 565# include "rsinc.h"
540 Rs_geometry, 566# undef def
541 Rs_reverseVideo, 567# undef reserve
542 Rs_color,
543 _Rs_color = Rs_color + NRS_COLORS - 1,
544 Rs_font,
545#if ENABLE_STYLES
546 Rs_boldFont,
547 Rs_italicFont,
548 Rs_boldItalicFont,
549#endif
550 Rs_name,
551 Rs_title,
552#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
553 Rs_path,
554#endif
555#ifdef XPM_BACKGROUND
556 Rs_backgroundPixmap,
557#endif
558#if (MENUBAR_MAX)
559 Rs_menu,
560#endif
561 Rs_loginShell,
562 Rs_jumpScroll,
563#ifdef HAVE_SCROLLBARS
564 Rs_scrollBar,
565 Rs_scrollBar_right,
566 Rs_scrollBar_floating,
567 Rs_scrollBar_align,
568#endif
569 Rs_scrollstyle, /* Rs_scrollBar_style */
570 Rs_scrollTtyOutput,
571 Rs_scrollTtyKeypress,
572 Rs_scrollWithBuffer,
573 Rs_saveLines,
574 Rs_utmpInhibit,
575 Rs_visualBell,
576#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
577 Rs_mapAlert,
578#endif
579#ifdef META8_OPTION
580 Rs_meta8,
581#endif
582#ifdef MOUSE_WHEEL
583 Rs_mouseWheelScrollPage,
584#endif
585#ifndef NO_BACKSPACE_KEY
586 Rs_backspace_key,
587#endif
588#ifndef NO_DELETE_KEY
589 Rs_delete_key,
590#endif
591 Rs_selectstyle,
592#ifdef PRINTPIPE
593 Rs_print_pipe,
594#endif
595#ifdef USE_XIM
596 Rs_preeditType,
597 Rs_inputMethod,
598#endif
599#ifdef TRANSPARENT
600 Rs_transparent,
601 Rs_transparent_all,
602#endif
603#if ENABLE_FRILLS
604 Rs_ext_bwidth,
605 Rs_int_bwidth,
606 Rs_borderLess,
607#endif
608 Rs_scrollBar_thickness,
609#if ENABLE_FRILLS
610 Rs_lineSpace,
611#endif
612 Rs_cutchars,
613 Rs_modifier,
614 Rs_answerbackstring,
615 Rs_tripleclickwords,
616 Rs_insecure,
617 Rs_cursorBlink,
618 Rs_pointerBlank,
619 Rs_pointerBlankDelay,
620 Rs_imLocale,
621 Rs_pastableTabs,
622#ifndef NO_SECONDARY_SCREEN
623 Rs_secondaryScreen,
624 Rs_secondaryScroll,
625#endif
626#ifdef OFF_FOCUS_FADING
627 Rs_fade,
628#endif
629#ifdef TINTING
630 Rs_shade,
631#endif
632 NUM_RESOURCES 568 NUM_RESOURCES
633}; 569};
634 570
635// see init.C:xa_names, which must be kept in sync 571// see init.C:xa_names, which must be kept in sync
636enum { 572enum {
… …
640 XA_MULTIPLE, 576 XA_MULTIPLE,
641 XA_TARGETS, 577 XA_TARGETS,
642 XA_TIMESTAMP, 578 XA_TIMESTAMP,
643 XA_VT_SELECTION, 579 XA_VT_SELECTION,
644 XA_INCR, 580 XA_INCR,
581 XA_WM_PROTOCOLS,
645 XA_WMDELETEWINDOW, 582 XA_WM_DELETE_WINDOW,
646 XA_CLIPBOARD, 583 XA_CLIPBOARD,
647#if ENABLE_FRILLS 584#if ENABLE_FRILLS
585 XA_MOTIF_WM_HINTS,
586#endif
587#if ENABLE_EWMH
648 XA_NET_WM_PID, 588 XA_NET_WM_PID,
649 XA_MOTIF_WM_HINTS,
650 XA_NET_WM_NAME, 589 XA_NET_WM_NAME,
651 XA_NET_WM_ICON_NAME, 590 XA_NET_WM_ICON_NAME,
591 XA_NET_WM_PING,
652#endif 592#endif
653#if USE_XIM 593#if USE_XIM
654 XA_WM_LOCALE_NAME, 594 XA_WM_LOCALE_NAME,
655#endif 595#endif
656#if TRANSPARENT 596#if TRANSPARENT
… …
658 XA_ESETROOT_PMAP_ID, 598 XA_ESETROOT_PMAP_ID,
659#endif 599#endif
660#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 600#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
661 XA_DNDPROTOCOL, 601 XA_DNDPROTOCOL,
662 XA_DNDSELECTION, 602 XA_DNDSELECTION,
603#endif
604#if ENABLE_XEMBED
605 XA_XEMBED,
606 XA_XEMBED_INFO,
663#endif 607#endif
664 NUM_XA 608 NUM_XA
665}; 609};
666 610
667/* DEC private modes */ 611/* DEC private modes */
… …
695 priv_modes |= (bit); \ 639 priv_modes |= (bit); \
696 else \ 640 else \
697 priv_modes &= ~(bit) 641 priv_modes &= ~(bit)
698 642
699#ifdef ALLOW_132_MODE 643#ifdef ALLOW_132_MODE
700# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 644# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
701#else 645#else
702# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 646# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
703#endif 647#endif
704 648
705// do not change these constants lightly, there are many interdependencies 649// do not change these constants lightly, there are many interdependencies
706#define IMBUFSIZ 128 // input modifier buffer sizes 650#define IMBUFSIZ 128 // input modifier buffer sizes
707#define KBUFSZ 512 // size of keyboard mapping buffer 651#define KBUFSZ 512 // size of keyboard mapping buffer
708#define CBUFSIZ 4096 // size of command buffer 652#define CBUFSIZ 2048 // size of command buffer
709#define UBUFSIZ 4096 // character buffer 653#define UBUFSIZ 2048 // character buffer
710 654
711#ifndef PATH_MAX 655#ifndef PATH_MAX
712# define PATH_MAX 16384 656# define PATH_MAX 16384
713#endif 657#endif
714 658
… …
742/* 686/*
743 ***************************************************************************** 687 *****************************************************************************
744 * MACRO DEFINES 688 * MACRO DEFINES
745 ***************************************************************************** 689 *****************************************************************************
746 */ 690 */
747#define memset(x, y, z) memset((x), (y), (size_t)(z)) 691#define dDisp Display *disp = display->display
748#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
749#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
750#define strcasecmp(x, y) strcasecmp((x), (y))
751#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
752#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
753#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
754#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
755#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
756#define strcat(x, y) strcat((char *)(x), (const char *)(y))
757#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
758#define strdup(x) strdup((const char *)(x))
759#define strlen(x) strlen((const char *)(x))
760#define strchr(x, y) strchr((const char *)(x), (int)(y))
761#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
762 692
763/* convert pixel dimensions to row/column values. Everything as int32_t */ 693/* convert pixel dimensions to row/column values. Everything as int32_t */
764#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 694#define Pixel2Col(x) Pixel2Width((int32_t)(x))
765#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 695#define Pixel2Row(y) Pixel2Height((int32_t)(y))
766#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 696#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
767#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 697#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
768#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 698#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
769#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 699#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
770#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 700#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
771#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 701#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
772 702
773#define TermWin_TotalWidth() ((int32_t)TermWin.width) 703#define TEMP_ENV temp_environ temp_environ (envv)
774#define TermWin_TotalHeight() ((int32_t)TermWin.height) 704
705#define OPTION(opt) (options & (opt))
706#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
707 | Opt_jumpScroll | Opt_secondaryScreen \
708 | Opt_pastableTabs | Opt_intensityStyles)
709
710// for m >= -n, ensure remainder lies between 0..n-1
711#define MOD(m,n) (((m) + (n)) % (n))
712
713#define LINENO(n) MOD (term_start + int(n), total_rows)
714#define ROW(n) row_buf [LINENO (n)]
775 715
776/* how to build & extract colors and attributes */ 716/* how to build & extract colors and attributes */
777#define GET_BASEFG(x) (((x) & RS_fgMask)) 717#define GET_BASEFG(x) (((x) & RS_fgMask))
778#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 718#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
779#ifndef NO_BRIGHTCOLOR
780# define GET_FGCOLOR(x) \
781 ((((x) & RS_Bold) == 0 \
782 || GET_BASEFG (x) < minCOLOR \
783 || GET_BASEFG (x) >= minBrightCOLOR) \
784 ? GET_BASEFG (x) \
785 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
786# define GET_BGCOLOR(x) \
787 ((((x) & RS_Blink) == 0 \
788 || GET_BASEBG (x) < minCOLOR \
789 || GET_BASEBG (x) >= minBrightCOLOR) \
790 ? GET_BASEBG (x) \
791 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
792#else
793# define GET_FGCOLOR(x) GET_BASEFG(x)
794# define GET_BGCOLOR(x) GET_BASEBG(x)
795#endif
796 719
797#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 720#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
798#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 721#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
799 722
800#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 723#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
813 736
814#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 737#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
815#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 738#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
816 739
817#if ENABLE_STYLES 740#if ENABLE_STYLES
818# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 741# define FONTSET(style) fontset[GET_STYLE (style)]
819#else 742#else
820# define FONTSET(style) TermWin.fontset[0] 743# define FONTSET(style) fontset[0]
821#endif 744#endif
822 745
823#ifdef HAVE_SCROLLBARS 746#ifdef HAVE_SCROLLBARS
824# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 747# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
825#else 748#else
… …
850#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 773#define scrollbar_size() (scrollBar.end - scrollBar.beg \
851 - scrollbar_minheight ()) 774 - scrollbar_minheight ())
852 775
853#if (MENUBAR_MAX > 1) 776#if (MENUBAR_MAX > 1)
854/* rendition style flags */ 777/* rendition style flags */
855# define menuBar_height() (TermWin.fheight + SHADOW) 778# define menuBar_height() (fheight + MENU_SHADOW)
856# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 779# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
857# define isMenuBarWindow(w) ((w) == menuBar.win) 780# define isMenuBarWindow(w) ((w) == menuBar.win)
858#else 781#else
859# define menuBar_height() (0) 782# define menuBar_height() (0)
860# define menuBar_TotalHeight() (0) 783# define menuBar_TotalHeight() (0)
861# define isMenuBarWindow(w) (0) 784# define isMenuBarWindow(w) (0)
… …
864#ifdef XPM_BACKGROUND 787#ifdef XPM_BACKGROUND
865# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 788# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
866#else 789#else
867# define XPMClearArea(a, b, c, d, e, f, g) 790# define XPMClearArea(a, b, c, d, e, f, g)
868#endif 791#endif
869
870#ifndef STRICT_FONT_CHECKING
871# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
872#endif
873
874#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
875#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
876 792
877#ifdef UTMP_SUPPORT 793#ifdef UTMP_SUPPORT
878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 794# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
879# undef HAVE_UTMPX_H 795# undef HAVE_UTMPX_H
880# undef HAVE_STRUCT_UTMPX 796# undef HAVE_STRUCT_UTMPX
… …
914#endif 830#endif
915 831
916extern class rxvt_failure_exception { } rxvt_failure_exception; 832extern class rxvt_failure_exception { } rxvt_failure_exception;
917 833
918typedef callback1<void, const char *> log_callback; 834typedef callback1<void, const char *> log_callback;
835typedef callback1<int, int> getfd_callback;
919 836
920extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 837extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
921extern void rxvt_log (const char *fmt, ...); 838extern void rxvt_log (const char *fmt, ...);
922extern void rxvt_warn (const char *fmt, ...); 839extern void rxvt_warn (const char *fmt, ...);
923extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 840extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
924extern void rxvt_exit_failure () __attribute__ ((noreturn)); 841extern void rxvt_exit_failure () __attribute__ ((noreturn));
925 842
926#define SET_LOCALE(locale) rxvt_set_locale (locale) 843#define SET_LOCALE(locale) rxvt_set_locale (locale)
927extern bool rxvt_set_locale (const char *locale); 844extern bool rxvt_set_locale (const char *locale);
845extern void rxvt_push_locale (const char *locale);
846extern void rxvt_pop_locale ();
928 847
929/*
930 ***************************************************************************** 848/****************************************************************************/
931 * VARIABLES 849
932 *****************************************************************************
933 */
934#ifdef MENUBAR 850#ifdef MENUBAR
935# include "menubar.h" 851# include "menubar.h"
936#endif 852#endif
937 853
938#define BLINK_INTERVAL 0.5 854#define BLINK_INTERVAL 0.5
… …
945# endif 861# endif
946# endif 862# endif
947# define __attribute__(x) 863# define __attribute__(x)
948#endif 864#endif
949 865
866/****************************************************************************/
867
868#define LINE_LONGER 0x0001 // line is continued on the next row
869#define LINE_FILTERED 0x0002 // line has been filtered
870#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
871
872struct line_t {
873 text_t *t; // terminal the text
874 rend_t *r; // rendition, uses RS_ flags
875 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
876 uint32_t f; // flags
877
878 bool is_longer ()
879 {
880 return f & LINE_LONGER;
881 }
882
883 void is_longer (int set)
884 {
885 if (set)
886 f |= LINE_LONGER;
887 else
888 f &= ~LINE_LONGER;
889 }
890
891 void clear ()
892 {
893 t = 0;
894 r = 0;
895 l = 0;
896 f = 0;
897 }
898
899 void touch () // call whenever a line is changed/touched/updated
900 {
901#if ENABLE_PERL
902 f &= ~LINE_FILTERED;
903#endif
904 }
905
906 void touch (int col)
907 {
908 max_it (l, col);
909 touch ();
910 }
911};
912
913/****************************************************************************/
914
950// primivite wrapper around mbstate_t to ensure initialisation 915// primivite wrapper around mbstate_t to ensure initialisation
951struct mbstate { 916struct mbstate {
952 mbstate_t mbs; 917 mbstate_t mbs;
953 918
954 operator mbstate_t *() { return &mbs; } 919 operator mbstate_t *() { return &mbs; }
955 void reset () { memset (&mbs, 0, sizeof (mbs)); } 920 void reset () { memset (&mbs, 0, sizeof (mbs)); }
956 mbstate () { reset (); } 921 mbstate () { reset (); }
957}; 922};
958 923
924/****************************************************************************/
925
959#define UNICODE_MASK 0x1fffffUL 926#define UNICODE_MASK 0x1fffffUL
960 927
961#if UNICODE3 928#if UNICODE3
962# define COMPOSE_LO 0x40000000UL 929# define COMPOSE_LO 0x40000000UL
963# define COMPOSE_HI 0x400fffffUL 930# define COMPOSE_HI 0x400fffffUL
964# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 931# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
965#else 932#else
933# if ENABLE_PERL
934# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
935# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
936# else
966# define COMPOSE_LO 0xd800UL 937# define COMPOSE_LO 0xd800UL
967# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 938# define COMPOSE_HI 0xf8ffUL
968# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 939# endif
940# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
969#endif 941#endif
970 942
971#if ENABLE_COMBINING 943#if ENABLE_COMBINING
972// compose chars are used to represent composite characters 944// compose chars are used to represent composite characters
973// that are not representable in unicode, as well as characters 945// that are not representable in unicode, as well as characters
… …
993}; 965};
994 966
995extern class rxvt_composite_vec rxvt_composite; 967extern class rxvt_composite_vec rxvt_composite;
996#endif 968#endif
997 969
970/****************************************************************************/
998 971
999#ifdef KEYSYM_RESOURCE 972#ifdef KEYSYM_RESOURCE
1000 class keyboard_manager; 973 class keyboard_manager;
1001#endif 974#endif
1002 975
1003struct rxvt_term : zero_initialized, rxvt_vars { 976struct rxvt_term : zero_initialized, rxvt_vars {
1004 log_callback *log_hook; // log error messages through this hook, if != 0 977 log_callback *log_hook; // log error messages through this hook, if != 0
1005 978 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
979#if ENABLE_PERL
980 rxvt_perl_term perl;
981#endif
1006 struct mbstate mbstate; // current input multibyte state 982 struct mbstate mbstate; // current input multibyte state
1007 983
1008 unsigned char want_refresh:1, 984 unsigned char want_refresh:1,
1009#ifdef TRANSPARENT 985#ifdef TRANSPARENT
1010 want_full_refresh:1, /* awaiting full screen refresh */ 986 want_full_refresh:1, /* awaiting full screen refresh */
… …
1160 bar_t *CurrentBar; 1136 bar_t *CurrentBar;
1161# if ! (MENUBAR_MAX > 1) 1137# if ! (MENUBAR_MAX > 1)
1162 bar_t BarList; 1138 bar_t BarList;
1163# endif /* (MENUBAR_MAX > 1) */ 1139# endif /* (MENUBAR_MAX > 1) */
1164#endif 1140#endif
1165#ifdef CURSOR_BLINK
1166 struct timeval lastcursorchange;
1167#endif
1168#ifdef POINTER_BLANK
1169 struct timeval lastmotion;
1170#endif
1171 1141
1172#if ENABLE_OVERLAY 1142#if ENABLE_OVERLAY
1173 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1143 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1174 text_t **ov_text; 1144 text_t **ov_text;
1175 rend_t **ov_rend; 1145 rend_t **ov_rend;
… …
1179 void scr_overlay_off (); 1149 void scr_overlay_off ();
1180 void scr_overlay_set (int x, int y, 1150 void scr_overlay_set (int x, int y,
1181 text_t text, 1151 text_t text,
1182 rend_t rend = OVERLAY_RSTYLE); 1152 rend_t rend = OVERLAY_RSTYLE);
1183 void scr_overlay_set (int x, int y, const char *s); 1153 void scr_overlay_set (int x, int y, const char *s);
1154 void scr_overlay_set (int x, int y, const wchar_t *s);
1184#endif 1155#endif
1185 1156
1186 vector<void *> allocated; // free these memory blocks with free() 1157 vector<void *> allocated; // free these memory blocks with free()
1187 1158
1188 char *env_windowid; /* environmental variable WINDOWID */ 1159 char *env_windowid; /* environmental variable WINDOWID */
1189 char *env_display; /* environmental variable DISPLAY */ 1160 char *env_display; /* environmental variable DISPLAY */
1190 char *env_term; /* environmental variable TERM */ 1161 char *env_term; /* environmental variable TERM */
1191 char *env_colorfgbg; 1162 char *env_colorfgbg;
1192 char *locale; 1163 char *locale;
1193 char charsets[4]; 1164 char charsets[4];
1194 unsigned char *v_buffer; /* pointer to physical buffer */ 1165 char *v_buffer; /* pointer to physical buffer */
1195 unsigned int v_buflen; /* size of area to write */ 1166 unsigned int v_buflen; /* size of area to write */
1196 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1167 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1197 1168
1198#ifdef KEYSYM_RESOURCE 1169#ifdef KEYSYM_RESOURCE
1199 keyboard_manager *keyboard; 1170 keyboard_manager *keyboard;
1200#endif 1171#endif
1201 1172
1202 const char *rs[NUM_RESOURCES]; 1173 const char *rs[NUM_RESOURCES];
1203 /* command input buffering */ 1174 /* command input buffering */
1204 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1175 char *cmdbuf_ptr, *cmdbuf_endp;
1205 unsigned char cmdbuf_base[CBUFSIZ]; 1176 char cmdbuf_base[CBUFSIZ];
1206 1177
1207 rxvt_salloc *talloc; // text line allocator 1178 rxvt_salloc *talloc; // text line allocator
1208 rxvt_salloc *ralloc; // rend line allocator 1179 rxvt_salloc *ralloc; // rend line allocator
1209 1180
1210 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1181 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1213 // ISO 14755 entry support 1184 // ISO 14755 entry support
1214 unicode_t iso14755buf; 1185 unicode_t iso14755buf;
1215 void commit_iso14755 (); 1186 void commit_iso14755 ();
1216 int hex_keyval (XKeyEvent &ev); 1187 int hex_keyval (XKeyEvent &ev);
1217# if ISO_14755 1188# if ISO_14755
1218 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1189 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1219 void iso14755_54 (int x, int y); 1190 void iso14755_54 (int x, int y);
1220# endif 1191# endif
1221#endif 1192#endif
1222 1193
1223 // modifies first argument(!) 1194 // modifies first argument(!)
1224 void paste (unsigned char *data, unsigned int len); 1195 void paste (char *data, unsigned int len);
1225 1196
1226 void flush (); 1197 void flush ();
1227 1198
1228#if TRANSPARENT 1199#if TRANSPARENT
1229 void rootwin_cb (XEvent &xev); 1200 void rootwin_cb (XEvent &xev);
1230 xevent_watcher rootwin_ev; 1201 xevent_watcher rootwin_ev;
1231#endif 1202#endif
1232
1233
1234 void sig_term (sig_watcher &w); sig_watcher sw_term;
1235 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1236 1203
1237 void x_cb (XEvent &xev); 1204 void x_cb (XEvent &xev);
1238 xevent_watcher termwin_ev; 1205 xevent_watcher termwin_ev;
1239 xevent_watcher vt_ev; 1206 xevent_watcher vt_ev;
1240#ifdef HAVE_SCROLLBARS 1207#ifdef HAVE_SCROLLBARS
… …
1274 void pointer_blank (); 1241 void pointer_blank ();
1275#endif 1242#endif
1276 void pointer_unblank (); 1243 void pointer_unblank ();
1277 1244
1278 void tt_printf (const char *fmt,...); 1245 void tt_printf (const char *fmt,...);
1279 void tt_write (const unsigned char *data, unsigned int len); 1246 void tt_write (const char *data, unsigned int len);
1280 void pty_write (); 1247 void pty_write ();
1281 1248
1282 void tt_winch (); 1249 void tt_winch ();
1283 1250
1284 rxvt_term (); 1251 rxvt_term ();
1285 ~rxvt_term (); 1252 ~rxvt_term ();
1253 void child_exit (); // child has exited, usually destroys
1286 void destroy (); 1254 void destroy ();
1255 void emergency_cleanup ();
1287 1256
1288 bool init (int argc, const char *const *argv); 1257 bool init (int argc, const char *const *argv);
1289 bool init_vars (); 1258 bool init_vars ();
1290 1259
1291 bool pty_fill (); 1260 bool pty_fill ();
1292 1261
1293 void init_secondary (); 1262 void init_secondary ();
1294 const char **init_resources (int argc, const char *const *argv); 1263 const char **init_resources (int argc, const char *const *argv);
1264 const char *x_resource (const char *name);
1295 void init_env (); 1265 void init_env ();
1296 void set_locale (const char *locale); 1266 void set_locale (const char *locale);
1297 void init_xlocale (); 1267 void init_xlocale ();
1298 void init_command (const char *const *argv); 1268 void init_command (const char *const *argv);
1299 void run_command (const char *const *argv); 1269 void run_command (const char *const *argv);
1300 int run_child (const char *const *argv); 1270 int run_child (const char *const *argv);
1301 1271
1302 void color_aliases (int idx); 1272 void color_aliases (int idx);
1303 void recolour_cursor (); 1273 void recolour_cursor ();
1304 void create_windows (int argc, const char *const *argv); 1274 void create_windows (int argc, const char *const *argv);
1305 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1275 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1306 void window_calc (unsigned int width, unsigned int height); 1276 void window_calc (unsigned int newwidth, unsigned int newheight);
1307 1277
1308#if USE_XIM 1278#if USE_XIM
1309 rxvt_xim *input_method; 1279 rxvt_xim *input_method;
1310 XIC Input_Context; 1280 XIC Input_Context;
1311 XIMStyle input_style; 1281 XIMStyle input_style;
… …
1334 1304
1335 /* autoconvert */ 1305 /* autoconvert */
1336 1306
1337 // command.C 1307 // command.C
1338 void lookup_key (XKeyEvent &ev); 1308 void lookup_key (XKeyEvent &ev);
1339 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1309 unsigned int cmd_write (const char *str, unsigned int count);
1340 1310
1341 unicode_t next_char (); 1311 wchar_t next_char ();
1342 unicode_t cmd_getc (); 1312 wchar_t cmd_getc ();
1343 unicode_t next_octet (); 1313 uint32_t next_octet ();
1344 unicode_t cmd_get8 (); 1314 uint32_t cmd_get8 ();
1345 1315
1346 bool cmd_parse (); 1316 bool cmd_parse ();
1347 void mouse_report (XButtonEvent &ev); 1317 void mouse_report (XButtonEvent &ev);
1348 void button_press (XButtonEvent &ev); 1318 void button_press (XButtonEvent &ev);
1349 void button_release (XButtonEvent &ev); 1319 void button_release (XButtonEvent &ev);
1320 void focus_in ();
1321 void focus_out ();
1350 int check_our_parents (); 1322 int check_our_parents ();
1351#ifdef PRINTPIPE 1323#ifdef PRINTPIPE
1352 FILE *popen_printer (); 1324 FILE *popen_printer ();
1353 int pclose_printer (FILE *stream); 1325 int pclose_printer (FILE *stream);
1354#endif 1326#endif
… …
1356 void process_nonprinting (unicode_t ch); 1328 void process_nonprinting (unicode_t ch);
1357 void process_escape_vt52 (unicode_t ch); 1329 void process_escape_vt52 (unicode_t ch);
1358 void process_escape_seq (); 1330 void process_escape_seq ();
1359 void process_csi_seq (); 1331 void process_csi_seq ();
1360 void process_window_ops (const int *args, unsigned int nargs); 1332 void process_window_ops (const int *args, unsigned int nargs);
1361 unsigned char *get_to_st (unicode_t &ends_how); 1333 char *get_to_st (unicode_t &ends_how);
1362 void process_dcs_seq (); 1334 void process_dcs_seq ();
1363 void process_osc_seq (); 1335 void process_osc_seq ();
1364 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1336 void process_color_seq (int report, int color, const char *str, char resp);
1365 void process_xterm_seq (int op, const char *str, unsigned char resp); 1337 void process_xterm_seq (int op, const char *str, char resp);
1366 int privcases (int mode, unsigned long bit); 1338 int privcases (int mode, unsigned long bit);
1367 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1339 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1368 void process_sgr_mode (unsigned int nargs, const int *arg); 1340 void process_sgr_mode (unsigned int nargs, const int *arg);
1369 void process_graphics (); 1341 void process_graphics ();
1370 // init.C 1342 // init.C
… …
1381 void set_title (const char *str); 1353 void set_title (const char *str);
1382 void set_icon_name (const char *str); 1354 void set_icon_name (const char *str);
1383 void set_window_color (int idx, const char *color); 1355 void set_window_color (int idx, const char *color);
1384 void set_colorfgbg (); 1356 void set_colorfgbg ();
1385 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1357 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1386 void set_widthheight (unsigned int width, unsigned int height); 1358 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1387 1359
1388#ifdef MENUBAR 1360#ifdef MENUBAR
1389 // menubar.C 1361 // menubar.C
1390 void menuitem_free (menu_t *menu, menuitem_t *item); 1362 void menuitem_free (menu_t *menu, menuitem_t *item);
1391 int action_dispatch (action_t *action); 1363 int action_dispatch (action_t *action);
… …
1417 void menubar_control (XButtonEvent &ev); 1389 void menubar_control (XButtonEvent &ev);
1418 void map_menuBar (int map); 1390 void map_menuBar (int map);
1419#endif 1391#endif
1420 1392
1421 // screen.C 1393 // screen.C
1422 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1394
1423 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1395 void lalloc (line_t &l)
1396 {
1397 l.t = (text_t *)talloc->alloc ();
1398 l.r = (rend_t *)ralloc->alloc ();
1399 }
1400
1401#if 0
1402 void lfree (line_t &l)
1403 {
1404 talloc->free (l.t);
1405 ralloc->free (l.r);
1406 }
1407#endif
1408
1409 void lresize (line_t &l)
1410 {
1411 if (!l.t)
1412 return;
1413
1414 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1415 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1416
1417 l.l = min (l.l, ncol);
1418
1419 if (ncol > prev_ncol)
1420 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1421 }
1422
1423 int fgcolor_of (rend_t r)
1424 {
1425 int base = GET_BASEFG (r);
1426#ifndef NO_BRIGHTCOLOR
1427 if (r & RS_Bold
1428# if ENABLE_STYLES
1429 && OPTION (Opt_intensityStyles)
1430# endif
1431 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1432 base += minBrightCOLOR - minCOLOR;
1433#endif
1434 return base;
1435 }
1436
1437 int bgcolor_of (rend_t r)
1438 {
1439 int base = GET_BASEBG (r);
1440#ifndef NO_BRIGHTCOLOR
1441 if (r & RS_Blink
1442# if ENABLE_STYLES
1443 && OPTION (Opt_intensityStyles)
1444# endif
1445 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1446 base += minBrightCOLOR - minCOLOR;
1447#endif
1448 return base;
1449 }
1450
1451 bool option (uint32_t opt)
1452 {
1453 return OPTION (opt);
1454 }
1455
1456 void set_option (uint32_t opt, bool set)
1457 {
1458 if (set)
1459 options |= opt;
1460 else
1461 options &= ~opt;
1462 }
1463
1464 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1465 void scr_blank_screen_mem (line_t &l, rend_t efs);
1424 int scr_scroll_text (int row1, int row2, int count, int spec); 1466 int scr_scroll_text (int row1, int row2, int count);
1425 void scr_reset (); 1467 void scr_reset ();
1426 void scr_reset_realloc ();
1427 void scr_release (); 1468 void scr_release ();
1428 void scr_clear (bool really = false); 1469 void scr_clear (bool really = false);
1429 void scr_refresh (unsigned char refresh_type); 1470 void scr_refresh (unsigned char refresh_type);
1430 bool scr_refresh_rend (rend_t mask, rend_t value); 1471 bool scr_refresh_rend (rend_t mask, rend_t value);
1431 void scr_erase_screen (int mode); 1472 void scr_erase_screen (int mode);
1473#if ENABLE_FRILLS
1474 void scr_erase_savelines ();
1475 void scr_backindex ();
1476 void scr_forwardindex ();
1477#endif
1432 void scr_touch (bool refresh); 1478 void scr_touch (bool refresh);
1433 void scr_expose (int x, int y, int width, int height, bool refresh); 1479 void scr_expose (int x, int y, int width, int height, bool refresh);
1434 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1480 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1435 void scr_recolour (); 1481 void scr_recolour ();
1436 void scr_remap_chars (); 1482 void scr_remap_chars ();
1437 void scr_remap_chars (text_t *tp, rend_t *rp); 1483 void scr_remap_chars (line_t &l);
1438 1484
1439 void scr_poweron (); 1485 void scr_poweron ();
1440 void scr_cursor (int mode); 1486 void scr_cursor (int mode);
1441 void scr_do_wrap (); 1487 void scr_do_wrap ();
1442 int scr_change_screen (int scrn); 1488 int scr_change_screen (int scrn);
1443 void scr_color (unsigned int color, int fgbg); 1489 void scr_color (unsigned int color, int fgbg);
1444 void scr_rendition (int set, int style); 1490 void scr_rendition (int set, int style);
1445 void scr_add_lines (const unicode_t *str, int nlines, int len); 1491 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1446 void scr_backspace (); 1492 void scr_backspace ();
1447 void scr_tab (int count, bool ht = false); 1493 void scr_tab (int count, bool ht = false);
1448 void scr_backindex ();
1449 void scr_forwardindex ();
1450 void scr_gotorc (int row, int col, int relative); 1494 void scr_gotorc (int row, int col, int relative);
1451 void scr_index (enum page_dirn direction); 1495 void scr_index (enum page_dirn direction);
1452 void scr_erase_line (int mode); 1496 void scr_erase_line (int mode);
1453 void scr_E (); 1497 void scr_E ();
1454 void scr_insdel_lines (int count, int insdel); 1498 void scr_insdel_lines (int count, int insdel);
… …
1467 int scr_move_to (int y, int len); 1511 int scr_move_to (int y, int len);
1468 int scr_page (enum page_dirn direction, int nlines); 1512 int scr_page (enum page_dirn direction, int nlines);
1469 int scr_changeview (unsigned int oldviewstart); 1513 int scr_changeview (unsigned int oldviewstart);
1470 void scr_bell (); 1514 void scr_bell ();
1471 void scr_printscreen (int fullhist); 1515 void scr_printscreen (int fullhist);
1516 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1517 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1472 void scr_reverse_selection (); 1518 void scr_reverse_selection ();
1473 void scr_dump (int fd); 1519 void scr_dump (int fd);
1474 void selection_check (int check_more); 1520 void selection_check (int check_more);
1475 void selection_paste (Window win, Atom prop, bool delete_prop); 1521 void selection_paste (Window win, Atom prop, bool delete_prop);
1476 void selection_property (Window win, Atom prop); 1522 void selection_property (Window win, Atom prop);
1477 void selection_request (Time tm, int x, int y); 1523 void selection_request (Time tm, int x, int y);
1478 int selection_request_other (Atom target, int selnum); 1524 int selection_request_other (Atom target, int selnum);
1479 void selection_clear (); 1525 void selection_clear ();
1480 void selection_make (Time tm); 1526 void selection_make (Time tm);
1527 bool selection_grab (Time tm);
1481 void selection_start_colrow (int col, int row); 1528 void selection_start_colrow (int col, int row);
1482 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1529 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1483 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1530 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1484 void selection_remove_trailing_spaces (); 1531 void selection_remove_trailing_spaces ();
1485 void selection_send (const XSelectionRequestEvent &rq); 1532 void selection_send (const XSelectionRequestEvent &rq);
… …
1515 1562
1516 // xdefaults.C 1563 // xdefaults.C
1517 void get_options (int argc, const char *const *argv); 1564 void get_options (int argc, const char *const *argv);
1518 int parse_keysym (const char *str, const char *arg); 1565 int parse_keysym (const char *str, const char *arg);
1519 void get_xdefaults (FILE *stream, const char *name); 1566 void get_xdefaults (FILE *stream, const char *name);
1520 void extract_resources (Display *display, const char *name); 1567 void extract_resources ();
1521 // xpm.C 1568 // xpm.C
1522 int scale_pixmap (const char *geom); 1569 int scale_pixmap (const char *geom);
1523 void resize_pixmap (); 1570 void resize_pixmap ();
1524 Pixmap set_bgPixmap (const char *file); 1571 Pixmap set_bgPixmap (const char *file);
1525}; 1572};

Diff Legend

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