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.155 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.184 by root, Wed Jan 4 00:09:12 2006 UTC

… …
70 70
71#ifndef STDIN_FILENO 71#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 72# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 74# define STDERR_FILENO 2
75#endif
76
77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
79# define NO_SETOWNER_TTYDEV 1
80# endif
81#endif
82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
83# define NO_SETOWNER_TTYDEV 1
84#endif 75#endif
85 76
86/* 77/*
87 ***************************************************************************** 78 *****************************************************************************
88 * PROTOTYPES 79 * PROTOTYPES
… …
118char ** rxvt_splitcommastring (const char *cs); 109char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs); 110void rxvt_freecommastring (char **cs);
120char * rxvt_File_find (const char *file, const char *ext, const char *path); 111char * rxvt_File_find (const char *file, const char *ext, const char *path);
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs);
123 115
124/* 116/*
125 ***************************************************************************** 117 *****************************************************************************
126 * STRUCTURES AND TYPEDEFS 118 * STRUCTURES AND TYPEDEFS
127 ***************************************************************************** 119 *****************************************************************************
… …
137#endif 129#endif
138 130
139/* If we're using either the rxvt scrollbar or menu bars, keep the 131/* If we're using either the rxvt scrollbar or menu bars, keep the
140 * scrollColor resource. 132 * scrollColor resource.
141 */ 133 */
142#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 134#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
143# define KEEP_SCROLLCOLOR 1 135# define KEEP_SCROLLCOLOR 1
144#else 136#else
145# undef KEEP_SCROLLCOLOR 137# undef KEEP_SCROLLCOLOR
146#endif 138#endif
147 139
… …
161 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
162 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
163 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
164}; 156};
165 157
166#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
167#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
168#define SWAP_IT(one, two, typeof) \
169 do { \
170 typeof swapittmp; \
171 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
172 } while (/* CONSTCOND */ 0)
173#define BOUND_POSITIVE_INT16(val) \
174 (int16_t) ((val) <= 0 \
175 ? 0 \
176 : min ((val), (((uint16_t)-1)>>1)))
177
178#if ENABLE_FRILLS 158#if ENABLE_FRILLS
179typedef struct _mwmhints { 159typedef struct _mwmhints {
180 CARD32 flags; 160 CARD32 flags;
181 CARD32 functions; 161 CARD32 functions;
182 CARD32 decorations; 162 CARD32 decorations;
… …
233 213
234#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
235# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
236#endif 216#endif
237 217
238#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
239# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
240#endif 220#endif
241 221
242/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
243 223
… …
258# define HAVE_SCROLLBARS 1 238# define HAVE_SCROLLBARS 1
259#endif 239#endif
260 240
261/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 241/* width of scrollBar, menuBar shadow, must be 1 or 2 */
262#ifdef HALFSHADOW 242#ifdef HALFSHADOW
263# define SHADOW 1 243# define MENU_SHADOW 1
264#else 244#else
265# define SHADOW 2 245# define MENU_SHADOW 2
266#endif 246#endif
267 247
268#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
269#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
270#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
271 251
272#define R_SB_RXVT 0
273#define R_SB_NEXT 1 252#define R_SB_NEXT 1
274#define R_SB_XTERM 2 253#define R_SB_XTERM 2
275#define R_SB_PLAIN 4 254#define R_SB_PLAIN 4
255#define R_SB_RXVT 8
276 256
277#define SB_WIDTH_NEXT 19 257#define SB_WIDTH_NEXT 19
278#define SB_WIDTH_XTERM 15 258#define SB_WIDTH_XTERM 15
279#define SB_WIDTH_PLAIN 7 259#define SB_WIDTH_PLAIN 7
280#ifndef SB_WIDTH_RXVT 260#ifndef SB_WIDTH_RXVT
… …
362#define FONT_DN "#-" 342#define FONT_DN "#-"
363#define FONT_UP "#+" 343#define FONT_UP "#+"
364 344
365/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
366enum { 346enum {
367 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
368 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
369 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
370}; 350};
371 351
372/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
373enum { 353enum {
374 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
… …
387enum { 367enum {
388 PRIMARY = 0, 368 PRIMARY = 0,
389 SECONDARY, 369 SECONDARY,
390}; 370};
391 371
392#define RS_None 0 /* Normal */ 372#define RS_None 0
393 373
394#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
395#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
396 376
397// font styles 377// font styles
398#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
399#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
400 380
401// fake styles 381// fake styles
402#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
403#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
404#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
405 385
406// 5 bits still to go 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
389#define RS_customShift 19
407 390
408// other flags 391// other flags
409#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
410 393
411#define RS_styleCount 4 394#define RS_styleCount 4
… …
486 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
487 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
488 471
489 URxvt_view_up = 720, 472 URxvt_view_up = 720,
490 URxvt_view_down = 721, 473 URxvt_view_down = 721,
474
475 URxvt_perl = 777,
491}; 476};
492 477
493/* Words starting with `Color_' are colours. Others are counts */ 478/* Words starting with `Color_' are colours. Others are counts */
494/* 479/*
495 * The following comment is mostly obsolete since pixcolor_set was expanded:
496 * We're currently upto 29 colours. Only 3 more available. The
497 * PixColor and rendition colour usage should probably be decoupled 480 * The PixColor and rendition colour usage should probably be decoupled
498 * on the unnecessary items, e.g. Color_pointer, but won't bother 481 * on the unnecessary items, e.g. Color_pointer, but won't bother
499 * until we need to. Also, be aware of usage in pixcolor_set 482 * until we need to. Also, be aware of usage in pixcolor_set
500 */ 483 */
501 484
502enum colour_list { 485enum colour_list {
… …
552 Color_trough, 535 Color_trough,
553#endif 536#endif
554#if TINTING 537#if TINTING
555 Color_tint, 538 Color_tint,
556#endif 539#endif
540#if OFF_FOCUS_FADING
541 Color_fade,
542#endif
557 NRS_COLORS, /* */ 543 NRS_COLORS, /* */
558#ifdef KEEP_SCROLLCOLOR 544#ifdef KEEP_SCROLLCOLOR
559 Color_topShadow = NRS_COLORS, 545 Color_topShadow = NRS_COLORS,
560 Color_bottomShadow, 546 Color_bottomShadow,
561 TOTAL_COLORS 547 TOTAL_COLORS
… …
571 557
572/* 558/*
573 * Resource list 559 * Resource list
574 */ 560 */
575enum { 561enum {
576 Rs_display_name = 0, 562#define Rs_def(name) Rs_ ## name,
577 Rs_term_name, 563#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
578 Rs_iconName, 564#include "rsinc.h"
579 Rs_geometry, 565#undef Rs_def
580 Rs_reverseVideo, 566#undef Rs_reserve
581 Rs_color,
582 _Rs_color = Rs_color + NRS_COLORS - 1,
583 Rs_font,
584#if ENABLE_STYLES
585 Rs_boldFont,
586 Rs_italicFont,
587 Rs_boldItalicFont,
588#endif
589 Rs_name,
590 Rs_title,
591#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
592 Rs_path,
593#endif
594#ifdef XPM_BACKGROUND
595 Rs_backgroundPixmap,
596#endif
597#if (MENUBAR_MAX)
598 Rs_menu,
599#endif
600 Rs_loginShell,
601 Rs_jumpScroll,
602#ifdef HAVE_SCROLLBARS
603 Rs_scrollBar,
604 Rs_scrollBar_right,
605 Rs_scrollBar_floating,
606 Rs_scrollBar_align,
607 Rs_scrollstyle, /* Rs_scrollBar_style */
608 Rs_scrollBar_thickness,
609#endif
610 Rs_scrollTtyOutput,
611 Rs_scrollTtyKeypress,
612 Rs_scrollWithBuffer,
613 Rs_saveLines,
614 Rs_utmpInhibit,
615 Rs_visualBell,
616#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
617 Rs_mapAlert,
618#endif
619#ifdef META8_OPTION
620 Rs_meta8,
621#endif
622#ifdef MOUSE_WHEEL
623 Rs_mouseWheelScrollPage,
624#endif
625#ifndef NO_BACKSPACE_KEY
626 Rs_backspace_key,
627#endif
628#ifndef NO_DELETE_KEY
629 Rs_delete_key,
630#endif
631 Rs_selectstyle,
632#ifdef PRINTPIPE
633 Rs_print_pipe,
634#endif
635#ifdef USE_XIM
636 Rs_preeditType,
637 Rs_inputMethod,
638#endif
639#ifdef TRANSPARENT
640 Rs_transparent,
641 Rs_transparent_all,
642#endif
643#if ENABLE_FRILLS
644 Rs_ext_bwidth,
645 Rs_int_bwidth,
646 Rs_borderLess,
647 Rs_lineSpace,
648 Rs_pty_fd,
649 Rs_cursorUnderline,
650#endif
651#if CURSOR_BLINK
652 Rs_cursorBlink,
653#endif
654#if ENABLE_XEMBED
655 Rs_embed,
656#endif
657 Rs_cutchars,
658 Rs_modifier,
659 Rs_answerbackstring,
660 Rs_tripleclickwords,
661 Rs_insecure,
662 Rs_pointerBlank,
663 Rs_pointerBlankDelay,
664 Rs_imLocale,
665 Rs_imFont,
666 Rs_pastableTabs,
667#ifndef NO_SECONDARY_SCREEN
668 Rs_secondaryScreen,
669 Rs_secondaryScroll,
670#endif
671#ifdef OFF_FOCUS_FADING
672 Rs_fade,
673#endif
674#ifdef TINTING
675 Rs_shade,
676#endif
677 NUM_RESOURCES 567 NUM_RESOURCES
678}; 568};
679 569
680// see init.C:xa_names, which must be kept in sync 570// see init.C:xa_names, which must be kept in sync
681enum { 571enum {
… …
756#endif 646#endif
757 647
758// do not change these constants lightly, there are many interdependencies 648// do not change these constants lightly, there are many interdependencies
759#define IMBUFSIZ 128 // input modifier buffer sizes 649#define IMBUFSIZ 128 // input modifier buffer sizes
760#define KBUFSZ 512 // size of keyboard mapping buffer 650#define KBUFSZ 512 // size of keyboard mapping buffer
761#define CBUFSIZ 4096 // size of command buffer 651#define CBUFSIZ 2048 // size of command buffer
762#define UBUFSIZ 4096 // character buffer 652#define UBUFSIZ 2048 // character buffer
763 653
764#ifndef PATH_MAX 654#ifndef PATH_MAX
765# define PATH_MAX 16384 655# define PATH_MAX 16384
766#endif 656#endif
767 657
… …
816#define dDisp Display *disp = display->display 706#define dDisp Display *disp = display->display
817 707
818/* convert pixel dimensions to row/column values. Everything as int32_t */ 708/* convert pixel dimensions to row/column values. Everything as int32_t */
819#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 709#define Pixel2Col(x) Pixel2Width((int32_t)(x))
820#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 710#define Pixel2Row(y) Pixel2Height((int32_t)(y))
821#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 711#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
822#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 712#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
823#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 713#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
824#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 714#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
825#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
826#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
827 717
828#define TermWin_TotalWidth() ((int32_t)TermWin.width) 718#define TermWin_TotalWidth() ((int32_t)this->width)
829#define TermWin_TotalHeight() ((int32_t)TermWin.height) 719#define TermWin_TotalHeight() ((int32_t)this->height)
720
721// for m >= -n, ensure remainder lies between 0..n-1
722#define MOD(m,n) (((m) + (n)) % (n))
723
724#define LINENO(n) MOD (term_start + int(n), total_rows)
725#define ROW(n) row_buf [LINENO (n)]
830 726
831/* how to build & extract colors and attributes */ 727/* how to build & extract colors and attributes */
832#define GET_BASEFG(x) (((x) & RS_fgMask)) 728#define GET_BASEFG(x) (((x) & RS_fgMask))
833#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 729#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
834#ifndef NO_BRIGHTCOLOR
835# define GET_FGCOLOR(x) \
836 ((((x) & RS_Bold) == 0 \
837 || GET_BASEFG (x) < minCOLOR \
838 || GET_BASEFG (x) >= minBrightCOLOR) \
839 ? GET_BASEFG (x) \
840 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
841# define GET_BGCOLOR(x) \
842 ((((x) & RS_Blink) == 0 \
843 || GET_BASEBG (x) < minCOLOR \
844 || GET_BASEBG (x) >= minBrightCOLOR) \
845 ? GET_BASEBG (x) \
846 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
847#else
848# define GET_FGCOLOR(x) GET_BASEFG(x)
849# define GET_BGCOLOR(x) GET_BASEBG(x)
850#endif
851 730
852#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 731#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
853#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 732#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
854 733
855#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 734#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
868 747
869#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 748#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
870#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 749#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
871 750
872#if ENABLE_STYLES 751#if ENABLE_STYLES
873# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 752# define FONTSET(style) fontset[GET_STYLE (style)]
874#else 753#else
875# define FONTSET(style) TermWin.fontset[0] 754# define FONTSET(style) fontset[0]
876#endif 755#endif
877 756
878#ifdef HAVE_SCROLLBARS 757#ifdef HAVE_SCROLLBARS
879# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 758# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
880#else 759#else
… …
905#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 784#define scrollbar_size() (scrollBar.end - scrollBar.beg \
906 - scrollbar_minheight ()) 785 - scrollbar_minheight ())
907 786
908#if (MENUBAR_MAX > 1) 787#if (MENUBAR_MAX > 1)
909/* rendition style flags */ 788/* rendition style flags */
910# define menuBar_height() (TermWin.fheight + SHADOW) 789# define menuBar_height() (fheight + MENU_SHADOW)
911# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 790# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
912# define isMenuBarWindow(w) ((w) == menuBar.win) 791# define isMenuBarWindow(w) ((w) == menuBar.win)
913#else 792#else
914# define menuBar_height() (0) 793# define menuBar_height() (0)
915# define menuBar_TotalHeight() (0) 794# define menuBar_TotalHeight() (0)
916# define isMenuBarWindow(w) (0) 795# define isMenuBarWindow(w) (0)
… …
962#endif 841#endif
963 842
964extern class rxvt_failure_exception { } rxvt_failure_exception; 843extern class rxvt_failure_exception { } rxvt_failure_exception;
965 844
966typedef callback1<void, const char *> log_callback; 845typedef callback1<void, const char *> log_callback;
846typedef callback1<int, int> getfd_callback;
967 847
968extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 848extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
969extern void rxvt_log (const char *fmt, ...); 849extern void rxvt_log (const char *fmt, ...);
970extern void rxvt_warn (const char *fmt, ...); 850extern void rxvt_warn (const char *fmt, ...);
971extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 851extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
972extern void rxvt_exit_failure () __attribute__ ((noreturn)); 852extern void rxvt_exit_failure () __attribute__ ((noreturn));
973 853
974#define SET_LOCALE(locale) rxvt_set_locale (locale) 854#define SET_LOCALE(locale) rxvt_set_locale (locale)
975extern bool rxvt_set_locale (const char *locale); 855extern bool rxvt_set_locale (const char *locale);
856extern bool rxvt_push_locale (const char *locale);
857extern void rxvt_pop_locale ();
976 858
977/* 859/*
978 ***************************************************************************** 860 *****************************************************************************
979 * VARIABLES 861 * VARIABLES
980 ***************************************************************************** 862 *****************************************************************************
… …
1048 class keyboard_manager; 930 class keyboard_manager;
1049#endif 931#endif
1050 932
1051struct rxvt_term : zero_initialized, rxvt_vars { 933struct rxvt_term : zero_initialized, rxvt_vars {
1052 log_callback *log_hook; // log error messages through this hook, if != 0 934 log_callback *log_hook; // log error messages through this hook, if != 0
935 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
936
937#if ENABLE_PERL
938 void *self; // perl's $self
939#endif
1053 940
1054 struct mbstate mbstate; // current input multibyte state 941 struct mbstate mbstate; // current input multibyte state
1055 942
1056 unsigned char want_refresh:1, 943 unsigned char want_refresh:1,
1057#ifdef TRANSPARENT 944#ifdef TRANSPARENT
… …
1227 void scr_overlay_off (); 1114 void scr_overlay_off ();
1228 void scr_overlay_set (int x, int y, 1115 void scr_overlay_set (int x, int y,
1229 text_t text, 1116 text_t text,
1230 rend_t rend = OVERLAY_RSTYLE); 1117 rend_t rend = OVERLAY_RSTYLE);
1231 void scr_overlay_set (int x, int y, const char *s); 1118 void scr_overlay_set (int x, int y, const char *s);
1119 void scr_overlay_set (int x, int y, const wchar_t *s);
1232#endif 1120#endif
1233 1121
1234 vector<void *> allocated; // free these memory blocks with free() 1122 vector<void *> allocated; // free these memory blocks with free()
1235 1123
1236 char *env_windowid; /* environmental variable WINDOWID */ 1124 char *env_windowid; /* environmental variable WINDOWID */
… …
1261 // ISO 14755 entry support 1149 // ISO 14755 entry support
1262 unicode_t iso14755buf; 1150 unicode_t iso14755buf;
1263 void commit_iso14755 (); 1151 void commit_iso14755 ();
1264 int hex_keyval (XKeyEvent &ev); 1152 int hex_keyval (XKeyEvent &ev);
1265# if ISO_14755 1153# if ISO_14755
1266 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1154 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1267 void iso14755_54 (int x, int y); 1155 void iso14755_54 (int x, int y);
1268# endif 1156# endif
1269#endif 1157#endif
1270 1158
1271 // modifies first argument(!) 1159 // modifies first argument(!)
… …
1275 1163
1276#if TRANSPARENT 1164#if TRANSPARENT
1277 void rootwin_cb (XEvent &xev); 1165 void rootwin_cb (XEvent &xev);
1278 xevent_watcher rootwin_ev; 1166 xevent_watcher rootwin_ev;
1279#endif 1167#endif
1280
1281
1282 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1283 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1284 1168
1285 void x_cb (XEvent &xev); 1169 void x_cb (XEvent &xev);
1286 xevent_watcher termwin_ev; 1170 xevent_watcher termwin_ev;
1287 xevent_watcher vt_ev; 1171 xevent_watcher vt_ev;
1288#ifdef HAVE_SCROLLBARS 1172#ifdef HAVE_SCROLLBARS
… …
1329 1213
1330 void tt_winch (); 1214 void tt_winch ();
1331 1215
1332 rxvt_term (); 1216 rxvt_term ();
1333 ~rxvt_term (); 1217 ~rxvt_term ();
1218 void child_exit (); // child has exited, usually destroys
1334 void destroy (); 1219 void destroy ();
1335 void emergency_cleanup (); 1220 void emergency_cleanup ();
1336 1221
1337 bool init (int argc, const char *const *argv); 1222 bool init (int argc, const char *const *argv);
1338 bool init_vars (); 1223 bool init_vars ();
… …
1349 int run_child (const char *const *argv); 1234 int run_child (const char *const *argv);
1350 1235
1351 void color_aliases (int idx); 1236 void color_aliases (int idx);
1352 void recolour_cursor (); 1237 void recolour_cursor ();
1353 void create_windows (int argc, const char *const *argv); 1238 void create_windows (int argc, const char *const *argv);
1354 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1239 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1355 void window_calc (unsigned int width, unsigned int height); 1240 void window_calc (unsigned int newwidth, unsigned int newheight);
1356 1241
1357#if USE_XIM 1242#if USE_XIM
1358 rxvt_xim *input_method; 1243 rxvt_xim *input_method;
1359 XIC Input_Context; 1244 XIC Input_Context;
1360 XIMStyle input_style; 1245 XIMStyle input_style;
… …
1432 void set_title (const char *str); 1317 void set_title (const char *str);
1433 void set_icon_name (const char *str); 1318 void set_icon_name (const char *str);
1434 void set_window_color (int idx, const char *color); 1319 void set_window_color (int idx, const char *color);
1435 void set_colorfgbg (); 1320 void set_colorfgbg ();
1436 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1321 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1437 void set_widthheight (unsigned int width, unsigned int height); 1322 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1438 1323
1439#ifdef MENUBAR 1324#ifdef MENUBAR
1440 // menubar.C 1325 // menubar.C
1441 void menuitem_free (menu_t *menu, menuitem_t *item); 1326 void menuitem_free (menu_t *menu, menuitem_t *item);
1442 int action_dispatch (action_t *action); 1327 int action_dispatch (action_t *action);
… …
1468 void menubar_control (XButtonEvent &ev); 1353 void menubar_control (XButtonEvent &ev);
1469 void map_menuBar (int map); 1354 void map_menuBar (int map);
1470#endif 1355#endif
1471 1356
1472 // screen.C 1357 // screen.C
1473 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1358
1474 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1359 void lalloc (line_t &l)
1360 {
1361 l.t = (text_t *)talloc->alloc ();
1362 l.r = (rend_t *)ralloc->alloc ();
1363 }
1364
1365#if 0
1366 void lfree (line_t &l)
1367 {
1368 talloc->free (l.t);
1369 ralloc->free (l.r);
1370 }
1371#endif
1372
1373 void lresize (line_t &l)
1374 {
1375 if (!l.t)
1376 return;
1377
1378 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1379 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1380
1381 l.l = min (l.l, ncol);
1382
1383 if (ncol > prev_ncol)
1384 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1385 }
1386
1387 int fgcolor_of (rend_t r)
1388 {
1389 int base = GET_BASEFG (r);
1390#ifndef NO_BRIGHTCOLOR
1391 if (r & RS_Bold
1392# if ENABLE_STYLES
1393 && OPTION (Opt_intensityStyles)
1394# endif
1395 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1396 base += minBrightCOLOR - minCOLOR;
1397#endif
1398 return base;
1399 }
1400
1401 int bgcolor_of (rend_t r)
1402 {
1403 int base = GET_BASEBG (r);
1404#ifndef NO_BRIGHTCOLOR
1405 if (r & RS_Blink
1406# if ENABLE_STYLES
1407 && OPTION (Opt_intensityStyles)
1408# endif
1409 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1410 base += minBrightCOLOR - minCOLOR;
1411#endif
1412 return base;
1413 }
1414
1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1416 void scr_blank_screen_mem (line_t &l, rend_t efs);
1475 int scr_scroll_text (int row1, int row2, int count, int spec); 1417 int scr_scroll_text (int row1, int row2, int count);
1476 void scr_reset (); 1418 void scr_reset ();
1477 void scr_reset_realloc ();
1478 void scr_release (); 1419 void scr_release ();
1479 void scr_clear (bool really = false); 1420 void scr_clear (bool really = false);
1480 void scr_refresh (unsigned char refresh_type); 1421 void scr_refresh (unsigned char refresh_type);
1481 bool scr_refresh_rend (rend_t mask, rend_t value); 1422 bool scr_refresh_rend (rend_t mask, rend_t value);
1482 void scr_erase_screen (int mode); 1423 void scr_erase_screen (int mode);
… …
1488 void scr_touch (bool refresh); 1429 void scr_touch (bool refresh);
1489 void scr_expose (int x, int y, int width, int height, bool refresh); 1430 void scr_expose (int x, int y, int width, int height, bool refresh);
1490 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1431 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1491 void scr_recolour (); 1432 void scr_recolour ();
1492 void scr_remap_chars (); 1433 void scr_remap_chars ();
1493 void scr_remap_chars (text_t *tp, rend_t *rp); 1434 void scr_remap_chars (const line_t &l);
1494 1435
1495 void scr_poweron (); 1436 void scr_poweron ();
1496 void scr_cursor (int mode); 1437 void scr_cursor (int mode);
1497 void scr_do_wrap (); 1438 void scr_do_wrap ();
1498 int scr_change_screen (int scrn); 1439 int scr_change_screen (int scrn);
… …
1530 void selection_property (Window win, Atom prop); 1471 void selection_property (Window win, Atom prop);
1531 void selection_request (Time tm, int x, int y); 1472 void selection_request (Time tm, int x, int y);
1532 int selection_request_other (Atom target, int selnum); 1473 int selection_request_other (Atom target, int selnum);
1533 void selection_clear (); 1474 void selection_clear ();
1534 void selection_make (Time tm); 1475 void selection_make (Time tm);
1476 bool selection_grab (Time tm);
1535 void selection_start_colrow (int col, int row); 1477 void selection_start_colrow (int col, int row);
1536 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1478 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1537 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1479 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1538 void selection_remove_trailing_spaces (); 1480 void selection_remove_trailing_spaces ();
1539 void selection_send (const XSelectionRequestEvent &rq); 1481 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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