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.27 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

… …
8#include <X11/cursorfont.h> 8#include <X11/cursorfont.h>
9#include <X11/keysym.h> 9#include <X11/keysym.h>
10#include <X11/keysymdef.h> 10#include <X11/keysymdef.h>
11#include <X11/Xatom.h> 11#include <X11/Xatom.h>
12 12
13#include "encoding.h"
13#include "defaultfont.h" 14#include "defaultfont.h"
14#include "rxvtcolor.h" 15#include "rxvtcolor.h"
15#include "iom.h" 16#include "iom.h"
16#include "salloc.h" 17#include "salloc.h"
17
18#include <wchar.h>
19 18
20/* 19/*
21 ***************************************************************************** 20 *****************************************************************************
22 * SYSTEM HACKS 21 * SYSTEM HACKS
23 ***************************************************************************** 22 *****************************************************************************
… …
49 int line; 48 int line;
50 int local; 49 int local;
51} ttymode_t; 50} ttymode_t;
52#endif 51#endif
53 52
54#ifdef GREEK_SUPPORT
55# include "grkelot.h"
56#endif
57#ifdef XPM_BACKGROUND 53#ifdef XPM_BACKGROUND
58# ifdef XPM_INC_X11 54# ifdef XPM_INC_X11
59# include <X11/xpm.h> 55# include <X11/xpm.h>
60# else 56# else
61# include <xpm.h> 57# include <xpm.h>
… …
130 do { \ 126 do { \
131 typeof swapittmp; \ 127 typeof swapittmp; \
132 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \ 128 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
133 } while (/* CONSTCOND */ 0) 129 } while (/* CONSTCOND */ 0)
134#define BOUND_POSITIVE_INT16(val) \ 130#define BOUND_POSITIVE_INT16(val) \
135 (int16_t)((val) <= 0 \ 131 (int16_t) ((val) <= 0 \
136 ? 0 \ 132 ? 0 \
137 : min((val), (((uint16_t)-1)>>1))) 133 : min ((val), (((uint16_t)-1)>>1)))
138 134
139/* 135/*
140 ***************************************************************************** 136 *****************************************************************************
141 * NORMAL DEFINES 137 * NORMAL DEFINES
142 ***************************************************************************** 138 *****************************************************************************
143 */ 139 */
144 140
145#if defined (NO_OLD_SELECTION) && defined(NO_NEW_SELECTION)
146# error if you disable both selection styles, how can you select, silly?
147#endif
148
149#define APL_CLASS "XTerm" /* class name */
150#define APL_SUBCLASS "Rxvt" /* also check resources under this name */
151#define APL_NAME "rxvt" /* normal name */
152
153/* COLORTERM, TERM environment variables */ 141/* COLORTERM, TERM environment variables */
154#define COLORTERMENV "rxvt" 142#define COLORTERMENV "rxvt"
155#ifdef XPM_BACKGROUND 143#ifdef XPM_BACKGROUND
156# define COLORTERMENVFULL COLORTERMENV "-xpm" 144# define COLORTERMENVFULL COLORTERMENV "-xpm"
157#else 145#else
158# define COLORTERMENVFULL COLORTERMENV 146# define COLORTERMENVFULL COLORTERMENV
159#endif 147#endif
160#ifndef TERMENV 148#ifndef TERMENV
161# define TERMENV "xterm" 149# define TERMENV "rxvt"
162#endif 150#endif
163 151
164#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 152#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
165# define NO_MOUSE_REPORT_SCROLLBAR 153# define NO_MOUSE_REPORT_SCROLLBAR
166#endif 154#endif
… …
182 170
183#define menuBar_esc 10 171#define menuBar_esc 10
184#define scrollBar_esc 30 172#define scrollBar_esc 30
185#define menuBar_margin 2 /* margin below text */ 173#define menuBar_margin 2 /* margin below text */
186 174
187#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) 175#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
188# define HAVE_SCROLLBARS 176# define HAVE_SCROLLBARS
189#endif 177#endif
190 178
191/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 179/* width of scrollBar, menuBar shadow, must be 1 or 2 */
192#ifdef HALFSHADOW 180#ifdef HALFSHADOW
… …
200#define R_SB_ALIGN_BOTTOM 2 188#define R_SB_ALIGN_BOTTOM 2
201 189
202#define R_SB_RXVT 0 190#define R_SB_RXVT 0
203#define R_SB_NEXT 1 191#define R_SB_NEXT 1
204#define R_SB_XTERM 2 192#define R_SB_XTERM 2
193#define R_SB_PLAIN 4
205 194
206#define SB_WIDTH_NEXT 19 195#define SB_WIDTH_NEXT 19
207#define SB_WIDTH_XTERM 7 196#define SB_WIDTH_XTERM 15
197#define SB_WIDTH_PLAIN 7
208#ifndef SB_WIDTH_RXVT 198#ifndef SB_WIDTH_RXVT
209# define SB_WIDTH_RXVT 10 199# define SB_WIDTH_RXVT 10
210#endif 200#endif
211 201
212/* 202/*
… …
239 * | | :::::::: | 229 * | | :::::::: |
240 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT 230 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
241 * | +---------+ | 231 * | +---------+ |
242 * | | ......%%| | 232 * | | ......%%| |
243 * | | ......%%| | 233 * | | ......%%| |
244 * | | ..()..%%| | 234 * | | .. ()..%%| |
245 * | | ......%%| | 235 * | | ......%%| |
246 * | | %%%%%%%%| | 236 * | | %%%%%%%%| |
247 * | +---------+ | <......................... 237 * | +---------+ | <.........................
248 * | | <---< SB_PADDING : 238 * | | <---< SB_PADDING :
249 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT 239 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT
… …
270 * :............: 260 * :............:
271 * | 261 * |
272 * +---< SB_WIDTH_NEXT 262 * +---< SB_WIDTH_NEXT
273 */ 263 */
274 264
265enum {
275#define NO_REFRESH 0 /* Window not visible at all! */ 266 NO_REFRESH = 0 , /* Window not visible at all! */
276#define FAST_REFRESH (1<<0) /* Fully exposed window */ 267 FAST_REFRESH = 1<<0, /* Fully exposed window */
277#define SLOW_REFRESH (1<<1) /* Partially exposed window */ 268 SLOW_REFRESH = 1<<1, /* Partially exposed window */
278#define SMOOTH_REFRESH (1<<2) /* Do sync'ing to make it smooth */ 269 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
279#define REFRESH_BOUNDS (1<<3) 270 REFRESH_BOUNDS = 1<<3
271};
280 272
281#ifdef NO_SECONDARY_SCREEN 273#ifdef NO_SECONDARY_SCREEN
282# define NSCREENS 0 274# define NSCREENS 0
283#else 275#else
284# define NSCREENS 1 276# define NSCREENS 1
… …
291/* special (internal) prefix for font commands */ 283/* special (internal) prefix for font commands */
292#define FONT_CMD '#' 284#define FONT_CMD '#'
293#define FONT_DN "#-" 285#define FONT_DN "#-"
294#define FONT_UP "#+" 286#define FONT_UP "#+"
295 287
296/* flags for rxvt_scr_gotorc() */ 288/* flags for rxvt_scr_gotorc () */
289enum {
297#define C_RELATIVE 1 /* col movement is relative */ 290 C_RELATIVE = 1 , /* col movement is relative */
298#define R_RELATIVE 2 /* row movement is relative */ 291 R_RELATIVE = 2, /* row movement is relative */
299#define RELATIVE (R_RELATIVE|C_RELATIVE) 292 RELATIVE = 1 | 2,
293};
300 294
301/* modes for rxvt_scr_insdel_chars(), rxvt_scr_insdel_lines() */ 295/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
302#define INSERT -1 /* don't change these values */ 296enum {
303#define DELETE +1 297 INSERT = -1, /* don't change these values */
304#define ERASE +2 298 DELETE = +1,
299 ERASE = +2,
300};
305 301
306/* modes for rxvt_scr_page() - scroll page. used by scrollbar window */ 302/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
307enum page_dirn { 303enum page_dirn {
308 UP, 304 UP,
309 DN, 305 DN,
310 NO_DIR 306 NO_DIR,
311}; 307};
312 308
313/* arguments for rxvt_scr_change_screen() */ 309/* arguments for rxvt_scr_change_screen () */
314enum { 310enum {
315 PRIMARY = 0, 311 PRIMARY = 0,
316 SECONDARY 312 SECONDARY,
317}; 313};
318 314
319#define RS_None 0 /* Normal */ 315#define RS_None 0 /* Normal */
320 316
321#define RS_fgMask 0x000001FFu /* 512 colors */ 317#define RS_fgMask 0x000001FFu /* 512 colors */
… …
345enum { 341enum {
346 C0_NUL = 0x00, 342 C0_NUL = 0x00,
347 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 343 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
348 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 344 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
349 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 345 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
350 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1 346 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
351}; 347};
352#define CHAR_ST 0x9c /* 0234 */ 348#define CHAR_ST 0x9c /* 0234 */
353 349
354/* 350/*
355 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 351 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
356 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 352 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
357 */ 353 */
354enum {
358#define XTerm_name 0 355 XTerm_name = 0,
359#define XTerm_iconName 1 356 XTerm_iconName = 1,
360#define XTerm_title 2 357 XTerm_title = 2,
358 XTerm_property = 3, // change X property, not yet implemented
361#define XTerm_Color 4 /* change colors */ 359 XTerm_Color = 4, // change colors
360 XTerm_Color00 = 10, // not implemented, CLASH!
361 XTerm_Color01 = 11, // not implemented
362#define XTerm_Color_cursor 12 /* change actual 'Cursor' color */ 362 XTerm_Color_cursor = 12, // change actual 'Cursor' color
363#define XTerm_Color_pointer 13 /* change actual 'Pointer' color */ 363 XTerm_Color_pointer = 13, // change actual 'Pointer' color
364 XTerm_Color04 = 14, // not implemented
365 XTerm_Color05 = 15, // not implemented
366 XTerm_Color06 = 16, // not implemented
364#define XTerm_Color_RV 17 /* change actual 'Highlight' color */ 367 XTerm_Color_RV = 17, // change actual 'Highlight' color
365#define XTerm_Color_BD 18 /* change actual 'Bold' color */
366#define XTerm_Color_UL 19 /* change actual 'Underline' color */
367#define XTerm_logfile 46 /* not implemented */ 368 XTerm_logfile = 46, // not implemented
368#define XTerm_font 50 369 XTerm_font = 50,
369 370
370/* 371 XTerm_konsole30 = 30, // reserved for konsole
372 XTerm_konsole31 = 31, // reserved for konsole
373 XTerm_emacs51 = 51, // reserved for emacs shell
374 /*
371 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 375 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
372 */ 376 */
373#define XTerm_Menu 10 /* set menu item */ 377 XTerm_Menu = 10, // set menu item
378 XTerm_Color_BD = 18, // change actual 'Bold' color
379 XTerm_Color_UL = 19, // change actual 'Underline' color
374#define XTerm_Pixmap 20 /* new bg pixmap */ 380 XTerm_Pixmap = 20, // new bg pixmap
375#define XTerm_restoreFG 39 /* change default fg color */ 381 XTerm_restoreFG = 39, // change default fg color
376#define XTerm_restoreBG 49 /* change default bg color */ 382 XTerm_restoreBG = 49, // change default bg color
377#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 383 XTerm_dumpscreen = 55, // dump scrollback and all of screen
384 XTerm_locale = 701, // change locale
385 XTerm_findfont = 702, // find font of given character (in decimal)
386};
378 387
379/* Words starting with `Color_' are colours. Others are counts */ 388/* Words starting with `Color_' are colours. Others are counts */
380/* 389/*
381 * The following comment is mostly obsolete since pixcolor_set was expanded: 390 * The following comment is mostly obsolete since pixcolor_set was expanded:
382 * We're currently upto 29 colours. Only 3 more available. The 391 * We're currently upto 29 colours. Only 3 more available. The
… …
471 Rs_backgroundPixmap, 480 Rs_backgroundPixmap,
472#endif 481#endif
473#if (MENUBAR_MAX) 482#if (MENUBAR_MAX)
474 Rs_menu, 483 Rs_menu,
475#endif 484#endif
476#ifdef GREEK_SUPPORT
477 Rs_greek_keyboard,
478 Rs_greektoggle_key,
479#endif
480 Rs_loginShell, 485 Rs_loginShell,
481 Rs_jumpScroll, 486 Rs_jumpScroll,
482#ifdef HAVE_SCROLLBARS 487#ifdef HAVE_SCROLLBARS
483 Rs_scrollBar, 488 Rs_scrollBar,
484 Rs_scrollBar_right, 489 Rs_scrollBar_right,
… …
513#endif 518#endif
514#ifdef USE_XIM 519#ifdef USE_XIM
515 Rs_preeditType, 520 Rs_preeditType,
516 Rs_inputMethod, 521 Rs_inputMethod,
517#endif 522#endif
518#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
519 Rs_bigfont_key,
520 Rs_smallfont_key,
521#endif
522#ifdef TRANSPARENT 523#ifdef TRANSPARENT
523 Rs_transparent, 524 Rs_transparent,
524 Rs_transparent_all, 525 Rs_transparent_all,
525#endif 526#endif
526#ifndef NO_FRILLS 527#ifndef NO_FRILLS
… …
530 Rs_scrollBar_thickness, 531 Rs_scrollBar_thickness,
531#ifndef NO_LINESPACE 532#ifndef NO_LINESPACE
532 Rs_lineSpace, 533 Rs_lineSpace,
533#endif 534#endif
534 Rs_cutchars, 535 Rs_cutchars,
535#ifdef ACS_ASCII
536 Rs_acs_chars,
537#endif
538 Rs_modifier, 536 Rs_modifier,
539 Rs_answerbackstring, 537 Rs_answerbackstring,
540 Rs_tripleclickwords, 538 Rs_tripleclickwords,
541 Rs_cursorBlink, 539 Rs_cursorBlink,
542 Rs_pointerBlank, 540 Rs_pointerBlank,
543 Rs_pointerBlankDelay, 541 Rs_pointerBlankDelay,
544 Rs_imLocale, 542 Rs_imLocale,
545 NUM_RESOURCES 543 NUM_RESOURCES
546}; 544};
547 545
548// see init.C:xa_named, which must be kept in sync 546// see init.C:xa_names, which must be kept in sync
549enum { 547enum {
550 XA_TEXT = 0, 548 XA_TEXT = 0,
551 XA_COMPOUND_TEXT, 549 XA_COMPOUND_TEXT,
552 XA_UTF8_STRING, 550 XA_UTF8_STRING,
553 XA_MULTIPLE, 551 XA_MULTIPLE,
… …
597 PrivateModes |= (bit); \ 595 PrivateModes |= (bit); \
598 else \ 596 else \
599 PrivateModes &= ~(bit) 597 PrivateModes &= ~(bit)
600 598
601#ifdef ALLOW_132_MODE 599#ifdef ALLOW_132_MODE
602# define PrivMode_Default \
603(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 600# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
604#else 601#else
605# define PrivMode_Default \
606(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 602# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
607#endif 603#endif
608 604
609#define XDEPTH Xdepth 605#define XDEPTH display->depth
610#define XCMAP Xcmap 606#define XCMAP display->cmap
611#define XVISUAL Xvisual 607#define XVISUAL display->visual
612 608
613#define IMBUFSIZ 128 /* input modifier buffer sizes */ 609#define IMBUFSIZ 128 /* input modifier buffer sizes */
614#ifndef BUFSIZ 610#ifndef BUFSIZ
615# define BUFSIZ 4096 611# define BUFSIZ 4096
616#endif 612#endif
… …
648#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 644#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight)
649 645
650#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth) 646#define TermWin_TotalWidth() ((int32_t)TermWin.width + 2 * (int32_t)TermWin.int_bwidth)
651#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth) 647#define TermWin_TotalHeight() ((int32_t)TermWin.height + 2 * (int32_t)TermWin.int_bwidth)
652 648
653#define Xroot DefaultRootWindow(Xdisplay)
654
655/* how to build & extract colors and attributes */ 649/* how to build & extract colors and attributes */
656#define GET_BASEFG(x) (((x) & RS_fgMask)) 650#define GET_BASEFG(x) (((x) & RS_fgMask))
657#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 651#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
658#ifndef NO_BRIGHTCOLOR 652#ifndef NO_BRIGHTCOLOR
659# define GET_FGCOLOR(x) \ 653# define GET_FGCOLOR(x) \
660 ((((x) & RS_Bold) == 0 \ 654 ((((x) & RS_Bold) == 0 \
661 || GET_BASEFG(x) < minCOLOR \ 655 || GET_BASEFG (x) < minCOLOR \
662 || GET_BASEFG(x) >= minBrightCOLOR) \ 656 || GET_BASEFG (x) >= minBrightCOLOR) \
663 ? GET_BASEFG(x) \ 657 ? GET_BASEFG (x) \
664 : (GET_BASEFG(x) + (minBrightCOLOR - minCOLOR))) 658 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
665# define GET_BGCOLOR(x) \ 659# define GET_BGCOLOR(x) \
666 ((((x) & RS_Blink) == 0 \ 660 ((((x) & RS_Blink) == 0 \
667 || GET_BASEBG(x) < minCOLOR \ 661 || GET_BASEBG (x) < minCOLOR \
668 || GET_BASEBG(x) >= minBrightCOLOR) \ 662 || GET_BASEBG (x) >= minBrightCOLOR) \
669 ? GET_BASEBG(x) \ 663 ? GET_BASEBG (x) \
670 : (GET_BASEBG(x) + (minBrightCOLOR - minCOLOR))) 664 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
671#else 665#else
672# define GET_FGCOLOR(x) GET_BASEFG(x) 666# define GET_FGCOLOR(x) GET_BASEFG(x)
673# define GET_BGCOLOR(x) GET_BASEBG(x) 667# define GET_BGCOLOR(x) GET_BASEBG(x)
674#endif 668#endif
675 669
… …
699#define scrollbar_isUpDn() isupper (scrollBar.state) 693#define scrollbar_isUpDn() isupper (scrollBar.state)
700#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win) 694#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win)
701 695
702#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1)) 696#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1))
703#define scrollbarnext_upButton(y) ((y) > scrollBar.end \ 697#define scrollbarnext_upButton(y) ((y) > scrollBar.end \
704 && (y) <= scrollbarnext_dnval()) 698 && (y) <= scrollbarnext_dnval ())
705#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval()) 699#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval())
706#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT 700#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
707#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg) 701#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg)
708#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end) 702#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end)
709#define SCROLLRXVT_MINHEIGHT 10 703#define SCROLLRXVT_MINHEIGHT 10
… …
714 : SCROLLRXVT_MINHEIGHT) 708 : SCROLLRXVT_MINHEIGHT)
715#define scrollbar_above_slider(y) ((y) < scrollBar.top) 709#define scrollbar_above_slider(y) ((y) < scrollBar.top)
716#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 710#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
717#define scrollbar_position(y) ((y) - scrollBar.beg) 711#define scrollbar_position(y) ((y) - scrollBar.beg)
718#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 712#define scrollbar_size() (scrollBar.end - scrollBar.beg \
719 - scrollbar_minheight()) 713 - scrollbar_minheight ())
720 714
721#if (MENUBAR_MAX > 1) 715#if (MENUBAR_MAX > 1)
722/* rendition style flags */ 716/* rendition style flags */
723# define menuBar_height() (TermWin.fheight + SHADOW) 717# define menuBar_height() (TermWin.fheight + SHADOW)
724# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 718# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
… …
819 813
820// primivite wrapper around mbstate_t to ensure initialisation 814// primivite wrapper around mbstate_t to ensure initialisation
821struct mbstate { 815struct mbstate {
822 mbstate_t mbs; 816 mbstate_t mbs;
823 817
824 mbstate () 818 operator mbstate_t *() { return &mbs; }
819 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
820 mbstate () { reset (); }
821};
822
823#if UNICODE3
824# define COMPOSE_LO 0x40000000UL
825# define COMPOSE_HI 0x400fffffUL
826# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
827#else
828# define COMPOSE_LO 0xd800UL
829# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...
830# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)
831#endif
832
833#if ENABLE_COMBINING
834// compose chars are used to represent composite characters
835// that are not representable in unicode, as well as characters
836// not fitting in the BMP.
837struct compose_char {
838 unicode_t c1, c2; // any chars != NOCHAR are valid
839 compose_char (unicode_t c1, unicode_t c2)
840 : c1(c1), c2(c2)
841 { }
842};
843
844class rxvt_composite_vec {
845 vector<compose_char> v;
846public:
847 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
848 int expand (unicode_t c, wchar_t *r);
849 compose_char *operator [](text_t c)
825 { 850 {
826 MEMSET (&mbs, 0, sizeof (mbs)); 851 return c >= COMPOSE_LO && c < COMPOSE_LO + v.size ()
852 ? &v[c - COMPOSE_LO]
853 : 0;
827 } 854 }
828}; 855};
829 856
857extern class rxvt_composite_vec rxvt_composite;
858#endif
859
860
830struct rxvt_term : rxvt_vars { 861struct rxvt_term : rxvt_vars {
831 struct mbstate mbstate; 862 struct mbstate mbstate;
832 863
833 unsigned char want_refresh:1, 864 unsigned char want_refresh:1,
834#ifdef TRANSPARENT 865#ifdef TRANSPARENT
835 want_full_refresh:1, /* awaiting full screen refresh */ 866 want_full_refresh:1, /* awaiting full screen refresh */
836#endif 867#endif
… …
867#endif 898#endif
868 scrollbar_align, 899 scrollbar_align,
869 selection_wait, 900 selection_wait,
870 selection_type; 901 selection_type;
871/* ---------- */ 902/* ---------- */
872#ifdef GREEK_SUPPORT
873 short greek_mode; /* greek keyboard mode */
874#endif
875 short rvideo; 903 short rvideo;
876 int16_t num_scr; /* screen: number lines scrolled */ 904 int16_t num_scr; /* screen: number lines scrolled */
877 unsigned int prev_ncol, /* screen: previous number of columns */ 905 unsigned int prev_ncol, /* screen: previous number of columns */
878 prev_nrow; /* screen: previous number of rows */ 906 prev_nrow; /* screen: previous number of rows */
879#ifdef RXVT_GRAPHICS
880 uint16_t gr_prev_start;
881#endif
882/* ---------- */ 907/* ---------- */
883 rend_t rstyle; 908 rend_t rstyle;
884/* ---------- */ 909/* ---------- */
885 uint32_t pixcolor_set[NPIXCLR_SETS]; 910 uint32_t pixcolor_set[NPIXCLR_SETS];
886/* ---------- */ 911/* ---------- */
… …
948#endif 973#endif
949#ifdef XTERM_SCROLLBAR 974#ifdef XTERM_SCROLLBAR
950 GC xscrollbarGC, 975 GC xscrollbarGC,
951 ShadowGC; 976 ShadowGC;
952#endif 977#endif
978#ifdef PLAIN_SCROLLBAR
979 GC pscrollbarGC;
980#endif
953#ifdef NEXT_SCROLLBAR 981#ifdef NEXT_SCROLLBAR
954 GC blackGC, 982 GC blackGC,
955 whiteGC, 983 whiteGC,
956 grayGC, 984 grayGC,
957 darkGC, 985 darkGC,
… …
982 const char *key_backspace; 1010 const char *key_backspace;
983#endif 1011#endif
984#ifndef NO_DELETE_KEY 1012#ifndef NO_DELETE_KEY
985 const char *key_delete; 1013 const char *key_delete;
986#endif 1014#endif
987#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
988 KeySym ks_bigfont, ks_smallfont;
989#endif
990#ifdef GREEK_SUPPORT
991 KeySym ks_greekmodeswith;
992#endif
993#ifdef USE_XIM 1015#ifdef USE_XIM
1016 rxvt_xim *input_method;
994 XIC Input_Context; 1017 XIC Input_Context;
995 XIMStyle input_style; 1018 XIMStyle input_style;
996 int event_type; 1019 int event_type;
997#endif 1020#endif
998 struct mouse_event MEvent; 1021 struct mouse_event MEvent;
999 XComposeStatus compose; 1022 XComposeStatus compose;
1000#ifdef RXVT_GRAPHICS
1001 int graphics_up;
1002 struct grwin_t *gr_root;
1003#endif
1004 ttymode_t tio; 1023 ttymode_t tio;
1005#ifdef UTMP_SUPPORT 1024#ifdef UTMP_SUPPORT
1006# ifdef HAVE_STRUCT_UTMP 1025# ifdef HAVE_STRUCT_UTMP
1007 struct utmp ut; 1026 struct utmp ut;
1008# endif 1027# endif
… …
1017 row_col_t oldcursor; 1036 row_col_t oldcursor;
1018#ifdef XPM_BACKGROUND 1037#ifdef XPM_BACKGROUND
1019 bgPixmap_t bgPixmap; 1038 bgPixmap_t bgPixmap;
1020 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1039 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1021#endif 1040#endif
1022#ifdef MULTICHAR_SET
1023 int oldcursormulti;
1024 void (*multichar_decode)(unsigned char *str, int len);
1025#endif
1026#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1041#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1027 struct stat ttyfd_stat; /* original status of our tty */ 1042 struct stat ttyfd_stat; /* original status of our tty */
1028#endif 1043#endif
1029#ifdef MENUBAR 1044#ifdef MENUBAR
1030 menu_t *ActiveMenu, /* currently active menu */ 1045 menu_t *ActiveMenu, /* currently active menu */
1031 *BuildMenu; /* the menu currently being built */ 1046 *BuildMenu; /* the menu currently being built */
1032 bar_t *CurrentBar; 1047 bar_t *CurrentBar;
1033# if !(MENUBAR_MAX > 1) 1048# if ! (MENUBAR_MAX > 1)
1034 bar_t BarList; 1049 bar_t BarList;
1035# endif /* (MENUBAR_MAX > 1) */ 1050# endif /* (MENUBAR_MAX > 1) */
1036#endif
1037#ifdef RXVT_GRAPHICS
1038 Window gr_last_id;
1039#endif 1051#endif
1040#ifdef CURSOR_BLINK 1052#ifdef CURSOR_BLINK
1041 struct timeval lastcursorchange; 1053 struct timeval lastcursorchange;
1042#endif 1054#endif
1043#ifdef POINTER_BLANK 1055#ifdef POINTER_BLANK
… …
1052 char *locale; 1064 char *locale;
1053 char *codeset; 1065 char *codeset;
1054 char charsets[4]; 1066 char charsets[4];
1055 unsigned char *v_buffer; /* pointer to physical buffer */ 1067 unsigned char *v_buffer; /* pointer to physical buffer */
1056 unsigned int v_buflen; /* size of area to write */ 1068 unsigned int v_buflen; /* size of area to write */
1057 char *newfont[MAX_NFONTS]; 1069 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1058#ifdef KEYSYM_RESOURCE 1070#ifdef KEYSYM_RESOURCE
1059 const unsigned char *Keysym_map[256]; 1071 const unsigned char *Keysym_map[256];
1060#endif 1072#endif
1061 const char *rs[NUM_RESOURCES]; 1073 const char *rs[NUM_RESOURCES];
1062/* command input buffering */ 1074/* command input buffering */
… …
1068 1080
1069 void paste (const unsigned char *data, unsigned int len); 1081 void paste (const unsigned char *data, unsigned int len);
1070 1082
1071 void flush (); 1083 void flush ();
1072 1084
1085 void rootwin_cb (XEvent &xev);
1086 xevent_watcher rootwin_ev;
1087
1088 void x_cb (XEvent &xev);
1089 xevent_watcher termwin_ev;
1090 xevent_watcher vt_ev;
1091#ifdef HAVE_SCROLLBARS
1092 xevent_watcher scrollbar_ev;
1093#endif
1094#ifdef MENUBAR
1095 xevent_watcher menubar_ev;
1096#endif
1097
1073 void check_cb (check_watcher &w); check_watcher check_ev; 1098 void check_cb (check_watcher &w); check_watcher check_ev;
1074 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1099 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1075 1100
1076 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1101 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1077 void x_cb (io_watcher &w, short revents); io_watcher x_ev;
1078 1102
1079 void incr_cb (time_watcher &w); time_watcher incr_ev; 1103 void incr_cb (time_watcher &w); time_watcher incr_ev;
1080 1104
1081#ifdef CURSOR_BLINK 1105#ifdef CURSOR_BLINK
1082 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1106 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
… …
1101 void destroy (); 1125 void destroy ();
1102 1126
1103 bool init (int argc, const char *const *argv); 1127 bool init (int argc, const char *const *argv);
1104 bool init_vars (); 1128 bool init_vars ();
1105 1129
1106 uint32_t next_char (); 1130 unicode_t next_char ();
1107 1131
1108 bool pty_fill (); 1132 bool pty_fill ();
1109 void process_x_events ();
1110 1133
1111 void *operator new (size_t s); 1134 void *operator new (size_t s);
1112 void operator delete (void *p, size_t s); 1135 void operator delete (void *p, size_t s);
1113 1136
1114 void init_secondary (); 1137 void init_secondary ();
… …
1118 void init_xlocale (); 1141 void init_xlocale ();
1119 void init_command (const char *const *argv); 1142 void init_command (const char *const *argv);
1120 int run_command (const char *const *argv); 1143 int run_command (const char *const *argv);
1121 int run_child (const char *const *argv); 1144 int run_child (const char *const *argv);
1122 1145
1123 void color_aliases(int idx); 1146 void color_aliases (int idx);
1124 void recolour_cursor (); 1147 void recolour_cursor ();
1125 void create_windows (int argc, const char *const *argv); 1148 void create_windows (int argc, const char *const *argv);
1126 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1149 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1127 void window_calc (unsigned int width, unsigned int height); 1150 void window_calc (unsigned int width, unsigned int height);
1128 void set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1129 1151
1130#if USE_XIM 1152#if USE_XIM
1153 void im_destroy ();
1154 void im_cb (); im_watcher im_ev;
1131 void set_size (XRectangle *size); 1155 void im_set_size (XRectangle *size);
1132 void set_position (XPoint *pos); 1156 void im_set_position (XPoint *pos);
1133 void set_color (unsigned long *fg, unsigned long *bg); 1157 void im_set_color (unsigned long *fg, unsigned long *bg);
1158 void im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, XRectangle * needed_rect);
1159
1160 bool IMisRunning ();
1161 void IMSendSpot ();
1162 bool IM_get_IC (const char *modifiers);
1163 void IMSetStatusPosition ();
1134#endif 1164#endif
1135 1165
1136 void resize_scrollbar (); 1166 void resize_scrollbar ();
1137 1167
1138 void pixel_position (int *x, int *y); 1168 void pixel_position (int *x, int *y);
1139 1169
1140 void selection_click (int clicks, int x, int y); 1170 void selection_click (int clicks, int x, int y);
1141 void selection_extend (int x, int y, int flag); 1171 void selection_extend (int x, int y, int flag);
1142 void selection_rotate (int x, int y); 1172 void selection_rotate (int x, int y);
1143 1173
1144 /* screen(!) */ 1174 /* screen (!) */
1145 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1175 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs);
1146 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1176 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs);
1147 int scr_scroll_text (int row1, int row2, int count, int spec); 1177 int scr_scroll_text (int row1, int row2, int count, int spec);
1148 void scr_reset (); 1178 void scr_reset ();
1149 void scr_reset_realloc (); 1179 void scr_reset_realloc ();
1150 void scr_release (); 1180 void scr_release ();
1151 void scr_clear (); 1181 void scr_clear (bool really = true);
1152 void scr_refresh (unsigned char refresh_type); 1182 void scr_refresh (unsigned char refresh_type);
1153 bool scr_refresh_rend (rend_t mask, rend_t value); 1183 bool scr_refresh_rend (rend_t mask, rend_t value);
1154 void scr_erase_screen (int mode); 1184 void scr_erase_screen (int mode);
1155 void scr_touch (bool refresh); 1185 void scr_touch (bool refresh);
1156 void scr_expose (int x, int y, int width, int height, bool refresh); 1186 void scr_expose (int x, int y, int width, int height, bool refresh);
1187 void scr_remap_chars ();
1188 void scr_remap_chars (text_t *tp, rend_t *rp);
1157 1189
1158 /* autoconvert */ 1190 /* autoconvert */
1159 1191
1160 // command.C 1192 // command.C
1161 void lookup_key (XKeyEvent *ev); 1193 void lookup_key (XKeyEvent &ev);
1162 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1194 unsigned int cmd_write (const unsigned char *str, unsigned int count);
1163 uint32_t cmd_getc (); 1195 unicode_t cmd_getc ();
1196 bool cmd_parse ();
1164 void mouse_report (const XButtonEvent *ev); 1197 void mouse_report (XButtonEvent &ev);
1165 void process_x_event (XEvent *ev);
1166 void button_press (XButtonEvent *ev); 1198 void button_press (XButtonEvent &ev);
1167 void button_release (XButtonEvent *ev); 1199 void button_release (XButtonEvent &ev);
1168 int check_our_parents (); 1200 int check_our_parents ();
1169#ifdef PRINTPIPE 1201#ifdef PRINTPIPE
1170 FILE * popen_printer (); 1202 FILE *popen_printer ();
1171 int pclose_printer (FILE *stream); 1203 int pclose_printer (FILE *stream);
1172#endif 1204#endif
1173 void process_print_pipe (); 1205 void process_print_pipe ();
1174 void process_nonprinting (unsigned char ch); 1206 void process_nonprinting (unsigned char ch);
1175 void process_escape_vt52 (unsigned char ch); 1207 void process_escape_vt52 (unsigned char ch);
… …
1177 void process_csi_seq (); 1209 void process_csi_seq ();
1178 void process_window_ops (const int *args, unsigned int nargs); 1210 void process_window_ops (const int *args, unsigned int nargs);
1179 unsigned char * get_to_st (unsigned char *ends_how); 1211 unsigned char * get_to_st (unsigned char *ends_how);
1180 void process_dcs_seq (); 1212 void process_dcs_seq ();
1181 void process_osc_seq (); 1213 void process_osc_seq ();
1182 void xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))); 1214 void xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)));
1183 int privcases (int mode, unsigned long bit); 1215 int privcases (int mode, unsigned long bit);
1184 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1216 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1185 void process_sgr_mode (unsigned int nargs, const int *arg); 1217 void process_sgr_mode (unsigned int nargs, const int *arg);
1186 void process_graphics (); 1218 void process_graphics ();
1187 // init.C 1219 // init.C
… …
1192 void cleanutent (); 1224 void cleanutent ();
1193 // main.C; 1225 // main.C;
1194 void privileges (int mode); 1226 void privileges (int mode);
1195 void privileged_utmp (char action); 1227 void privileged_utmp (char action);
1196 void privileged_ttydev (char action); 1228 void privileged_ttydev (char action);
1197 void change_font (int init, const char *fontname); 1229 bool change_font (const char *fontname);
1198 void font_up_down (int n, int direction); 1230 bool font_up_down (int n, int direction);
1199 void set_title (const char *str); 1231 void set_title (const char *str);
1200 void set_iconName (const char *str); 1232 void set_iconName (const char *str);
1201 void set_window_color (int idx, const char *color); 1233 void set_window_color (int idx, const char *color);
1202 void set_colorfgbg (); 1234 void set_colorfgbg ();
1203 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1235 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1204 void set_widthheight (unsigned int width, unsigned int height); 1236 void set_widthheight (unsigned int width, unsigned int height);
1205 bool IMisRunning ();
1206 void IMSendSpot ();
1207 bool IM_get_IC ();
1208 void IMSetStatusPosition ();
1209 1237
1210#ifdef MENUBAR 1238#ifdef MENUBAR
1211 // menubar.C 1239 // menubar.C
1212 void menuitem_free (menu_t *menu, menuitem_t *item); 1240 void menuitem_free (menu_t *menu, menuitem_t *item);
1213 int action_dispatch (action_t *action); 1241 int action_dispatch (action_t *action);
1214 void menuarrow_free (char name); 1242 void menuarrow_free (char name);
1215 void menuarrow_add (char *string); 1243 void menuarrow_add (char *string);
1216 char * menu_find_base (menu_t **menu, char *path); 1244 char *menu_find_base (menu_t **menu, char *path);
1217 menu_t * menu_delete (menu_t *menu); 1245 menu_t *menu_delete (menu_t *menu);
1218 menu_t * menu_add (menu_t *parent, char *path); 1246 menu_t *menu_add (menu_t *parent, char *path);
1219 void drawbox_menubar (int x, int len, int state); 1247 void drawbox_menubar (int x, int len, int state);
1220 void drawtriangle (int x, int y, int state); 1248 void drawtriangle (int x, int y, int state);
1221 void drawbox_menuitem (int y, int state); 1249 void drawbox_menuitem (int y, int state);
1222 void menu_show (); 1250 void menu_show ();
1223 void menu_display (void (*update)(rxvt_t *)); 1251 void menu_display (void (rxvt_term::*update) ());
1224 void menu_hide_all (); 1252 void menu_hide_all ();
1225 void menu_hide (); 1253 void menu_hide ();
1226 void menu_clear (menu_t *menu); 1254 void menu_clear (menu_t *menu);
1227 void menubar_clear (); 1255 void menubar_clear ();
1228 bar_t * menubar_find (const char *name); 1256 bar_t *menubar_find (const char *name);
1229 int menubar_push (const char *name); 1257 int menubar_push (const char *name);
1230 void menubar_remove (const char *name); 1258 void menubar_remove (const char *name);
1231 void menubar_dump (FILE *fp); 1259 void menubar_dump (FILE *fp);
1232 void menubar_read (const char *filename); 1260 void menubar_read (const char *filename);
1233 void menubar_dispatch (char *str); 1261 void menubar_dispatch (char *str);
1234 void draw_Arrows (int name, int state); 1262 void draw_Arrows (int name, int state);
1235 void menubar_expose (); 1263 void menubar_expose ();
1236 int menubar_mapping (int map); 1264 int menubar_mapping (int map);
1237 int menu_select (XButtonEvent *ev); 1265 int menu_select (XButtonEvent &ev);
1238 void menubar_select (XButtonEvent *ev); 1266 void menubar_select (XButtonEvent &ev);
1239 void menubar_control (XButtonEvent *ev); 1267 void menubar_control (XButtonEvent &ev);
1240 void map_menuBar (int map); 1268 void map_menuBar (int map);
1241#endif 1269#endif
1242 1270
1243 // screen.C 1271 // screen.C
1244 void scr_poweron (); 1272 void scr_poweron ();
1245 void scr_cursor (int mode); 1273 void scr_cursor (int mode);
1246 int scr_change_screen (int scrn); 1274 int scr_change_screen (int scrn);
1247 void scr_color (unsigned int color, int fgbg); 1275 void scr_color (unsigned int color, int fgbg);
1248 void scr_rendition (int set, int style); 1276 void scr_rendition (int set, int style);
1249 void scr_add_lines (const uint32_t *str, int nlines, int len); 1277 void scr_add_lines (const unicode_t *str, int nlines, int len);
1250 void scr_backspace (); 1278 void scr_backspace ();
1251 void scr_tab (int count); 1279 void scr_tab (int count);
1252 void scr_backindex (); 1280 void scr_backindex ();
1253 void scr_forwardindex (); 1281 void scr_forwardindex ();
1254 void scr_gotorc (int row, int col, int relative); 1282 void scr_gotorc (int row, int col, int relative);
… …
1284 void selection_make (Time tm); 1312 void selection_make (Time tm);
1285 void selection_start_colrow (int col, int row); 1313 void selection_start_colrow (int col, int row);
1286 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1314 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1287 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1315 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1288 void selection_remove_trailing_spaces (); 1316 void selection_remove_trailing_spaces ();
1289 void selection_send (const XSelectionRequestEvent *rq); 1317 void selection_send (const XSelectionRequestEvent &rq);
1290 1318
1291#if defined(NEXT_SCROLLBAR) 1319#if defined(NEXT_SCROLLBAR)
1292 // scrollbar-next.C 1320 // scrollbar-next.C
1293 Pixmap renderPixmap (const char *const *data, int width, int height); 1321 Pixmap renderPixmap (const char *const *data, int width, int height);
1294 void init_scrollbar_stuff (); 1322 void init_scrollbar_stuff ();
1295 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1323 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1296 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1324 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1297# define scrollbar_update scrollbar_show_next // HACK
1298#endif 1325#endif
1299 1326
1300#if defined(RXVT_SCROLLBAR) 1327#if defined(RXVT_SCROLLBAR)
1301 // scrollbar-rxvt.C 1328 // scrollbar-rxvt.C
1302 void Draw_button (int x, int y, int state, int dirn); 1329 void Draw_button (int x, int y, int state, int dirn);
1303 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1330 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1304# define scrollbar_update scrollbar_show_rxvt // HACK
1305#endif 1331#endif
1306 1332
1307#if defined(XTERM_SCROLLBAR) 1333#if defined(XTERM_SCROLLBAR)
1308 // scrollbar-xterm.C 1334 // scrollbar-xterm.C
1309 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len); 1335 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1310# define scrollbar_update scrollbar_show_xterm // HACK 1336#endif
1337
1338#if defined(PLAIN_SCROLLBAR)
1339 // scrollbar-plain.C
1340 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1311#endif 1341#endif
1312 1342
1313 // scrollbar.C 1343 // scrollbar.C
1314 int scrollbar_mapping (int map); 1344 int scrollbar_mapping (int map);
1315 int scrollbar_show (int update); 1345 int scrollbar_show (int update);

Diff Legend

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