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.135 by root, Mon Dec 20 18:07:19 2004 UTC vs.
Revision 1.183 by root, Tue Jan 3 02:43:33 2006 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
28#endif
23 29
24/* 30/*
25 ***************************************************************************** 31 *****************************************************************************
26 * SYSTEM HACKS 32 * SYSTEM HACKS
27 ***************************************************************************** 33 *****************************************************************************
… …
66# define STDIN_FILENO 0 72# define STDIN_FILENO 0
67# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
68# define STDERR_FILENO 2 74# define STDERR_FILENO 2
69#endif 75#endif
70 76
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/* 77/*
81 ***************************************************************************** 78 *****************************************************************************
82 * PROTOTYPES 79 * PROTOTYPES
83 ***************************************************************************** 80 *****************************************************************************
84 */ 81 */
82// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 83RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 84RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 85void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 86void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 87void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 88void * rxvt_realloc (void *ptr, size_t size);
89void rxvt_privileges (rxvt_privaction action);
90
91// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len = -1); 92char * rxvt_wcstombs (const wchar_t *str, int len = -1);
92wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 93wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
93char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 94char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
94wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 95wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
95char * rxvt_strdup (const char *str); 96char * rxvt_strdup (const char *str);
97
98// misc.C
96char * rxvt_r_basename (const char *str); 99char * rxvt_r_basename (const char *str);
97void rxvt_vlog (const char *fmt, va_list arg_ptr); 100void rxvt_vlog (const char *fmt, va_list arg_ptr);
98void rxvt_log (const char *fmt,...); 101void rxvt_log (const char *fmt,...);
99void rxvt_warn (const char *fmt,...); 102void rxvt_warn (const char *fmt,...);
100void rxvt_fatal (const char *fmt,...); 103void rxvt_fatal (const char *fmt,...);
… …
106char ** rxvt_splitcommastring (const char *cs); 109char ** rxvt_splitcommastring (const char *cs);
107void rxvt_freecommastring (char **cs); 110void rxvt_freecommastring (char **cs);
108char * 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);
109void 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);
110void 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);
111 114void rxvt_usleep (int usecs);
112void rxvt_privileges (rxvt_privaction action);
113 115
114/* 116/*
115 ***************************************************************************** 117 *****************************************************************************
116 * STRUCTURES AND TYPEDEFS 118 * STRUCTURES AND TYPEDEFS
117 ***************************************************************************** 119 *****************************************************************************
… …
127#endif 129#endif
128 130
129/* 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
130 * scrollColor resource. 132 * scrollColor resource.
131 */ 133 */
132#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 134#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
133# define KEEP_SCROLLCOLOR 1 135# define KEEP_SCROLLCOLOR 1
134#else 136#else
135# undef KEEP_SCROLLCOLOR 137# undef KEEP_SCROLLCOLOR
136#endif 138#endif
137 139
… …
151 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
152 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
153 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
154}; 156};
155 157
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 158#if ENABLE_FRILLS
169typedef struct _mwmhints { 159typedef struct _mwmhints {
170 CARD32 flags; 160 CARD32 flags;
171 CARD32 functions; 161 CARD32 functions;
172 CARD32 decorations; 162 CARD32 decorations;
173 INT32 input_mode; 163 INT32 input_mode;
174 CARD32 status; 164 CARD32 status;
175} MWMHints; 165} MWMHints;
176#endif 166#endif
177 167
168#if ENABLE_XEMBED
169// XEMBED messages
170# define XEMBED_EMBEDDED_NOTIFY 0
171# define XEMBED_WINDOW_ACTIVATE 1
172# define XEMBED_WINDOW_DEACTIVATE 2
173# define XEMBED_REQUEST_FOCUS 3
174# define XEMBED_FOCUS_IN 4
175# define XEMBED_FOCUS_OUT 5
176# define XEMBED_FOCUS_NEXT 6
177# define XEMBED_FOCUS_PREV 7
178
179# define XEMBED_MODALITY_ON 10
180# define XEMBED_MODALITY_OFF 11
181# define XEMBED_REGISTER_ACCELERATOR 12
182# define XEMBED_UNREGISTER_ACCELERATOR 13
183# define XEMBED_ACTIVATE_ACCELERATOR 14
184
185// XEMBED detail code
186# define XEMBED_FOCUS_CURRENT 0
187# define XEMBED_FOCUS_FIRST 1
188# define XEMBED_FOCUS_LAST 2
189
190# define XEMBED_MAPPED (1 << 0)
191#endif
192
178/* 193/*
179 ***************************************************************************** 194 *****************************************************************************
180 * NORMAL DEFINES 195 * NORMAL DEFINES
181 ***************************************************************************** 196 *****************************************************************************
182 */ 197 */
… …
198 213
199#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
200# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
201#endif 216#endif
202 217
203#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
204# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
205#endif 220#endif
206 221
207/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
208 223
… …
223# define HAVE_SCROLLBARS 1 238# define HAVE_SCROLLBARS 1
224#endif 239#endif
225 240
226/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 241/* width of scrollBar, menuBar shadow, must be 1 or 2 */
227#ifdef HALFSHADOW 242#ifdef HALFSHADOW
228# define SHADOW 1 243# define MENU_SHADOW 1
229#else 244#else
230# define SHADOW 2 245# define MENU_SHADOW 2
231#endif 246#endif
232 247
233#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
234#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
235#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
236 251
237#define R_SB_RXVT 0
238#define R_SB_NEXT 1 252#define R_SB_NEXT 1
239#define R_SB_XTERM 2 253#define R_SB_XTERM 2
240#define R_SB_PLAIN 4 254#define R_SB_PLAIN 4
255#define R_SB_RXVT 8
241 256
242#define SB_WIDTH_NEXT 19 257#define SB_WIDTH_NEXT 19
243#define SB_WIDTH_XTERM 15 258#define SB_WIDTH_XTERM 15
244#define SB_WIDTH_PLAIN 7 259#define SB_WIDTH_PLAIN 7
245#ifndef SB_WIDTH_RXVT 260#ifndef SB_WIDTH_RXVT
… …
327#define FONT_DN "#-" 342#define FONT_DN "#-"
328#define FONT_UP "#+" 343#define FONT_UP "#+"
329 344
330/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
331enum { 346enum {
332 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
333 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
334 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
335}; 350};
336 351
337/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
338enum { 353enum {
339 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
… …
352enum { 367enum {
353 PRIMARY = 0, 368 PRIMARY = 0,
354 SECONDARY, 369 SECONDARY,
355}; 370};
356 371
357#define RS_None 0 /* Normal */ 372#define RS_None 0
358 373
359#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
360#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
361 376
362// font styles 377// font styles
363#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
364#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
365 380
366// fake styles 381// fake styles
367#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
368#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
369#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
370 385
371// 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
372 390
373// other flags 391// other flags
374#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
375 393
376#define RS_styleCount 4 394#define RS_styleCount 4
… …
438 XTerm_Color_UL = 19, // change actual 'Underline' color 456 XTerm_Color_UL = 19, // change actual 'Underline' color
439 XTerm_Pixmap = 20, // new bg pixmap 457 XTerm_Pixmap = 20, // new bg pixmap
440 XTerm_restoreFG = 39, // change default fg color 458 XTerm_restoreFG = 39, // change default fg color
441 XTerm_restoreBG = 49, // change default bg color 459 XTerm_restoreBG = 49, // change default bg color
442 XTerm_dumpscreen = 55, // dump scrollback and all of screen 460 XTerm_dumpscreen = 55, // dump scrollback and all of screen
461
443 XTerm_locale = 701, // change locale 462 URxvt_locale = 701, // change locale
444 XTerm_Menu = 703, // set menu item 463 URxvt_Menu = 703, // set menu item
445 XTerm_Color_IT = 704, // change actual 'Italic' colour 464 URxvt_Color_IT = 704, // change actual 'Italic' colour
446 XTerm_Color_tint = 705, // change actual tint colour 465 URxvt_Color_tint = 705, // change actual tint colour
447 466
448 URxvt_font = 710, 467 URxvt_font = 710,
449 URxvt_boldFont = 711, 468 URxvt_boldFont = 711,
450 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
451 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
471
472 URxvt_view_up = 720,
473 URxvt_view_down = 721,
452}; 474};
453 475
454/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
455/* 477/*
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 478 * The PixColor and rendition colour usage should probably be decoupled
459 * on the unnecessary items, e.g. Color_pointer, but won't bother 479 * 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 480 * until we need to. Also, be aware of usage in pixcolor_set
461 */ 481 */
462 482
463enum colour_list { 483enum colour_list {
… …
513 Color_trough, 533 Color_trough,
514#endif 534#endif
515#if TINTING 535#if TINTING
516 Color_tint, 536 Color_tint,
517#endif 537#endif
538#if OFF_FOCUS_FADING
539 Color_fade,
540#endif
518 NRS_COLORS, /* */ 541 NRS_COLORS, /* */
519#ifdef KEEP_SCROLLCOLOR 542#ifdef KEEP_SCROLLCOLOR
520 Color_topShadow = NRS_COLORS, 543 Color_topShadow = NRS_COLORS,
521 Color_bottomShadow, 544 Color_bottomShadow,
522 TOTAL_COLORS 545 TOTAL_COLORS
… …
532 555
533/* 556/*
534 * Resource list 557 * Resource list
535 */ 558 */
536enum { 559enum {
537 Rs_display_name = 0, 560#define Rs_def(name) Rs_ ## name,
538 Rs_term_name, 561#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
539 Rs_iconName, 562#include "rsinc.h"
540 Rs_geometry, 563#undef Rs_def
541 Rs_reverseVideo, 564#undef Rs_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#ifndef NO_LINESPACE
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 565 NUM_RESOURCES
633}; 566};
634 567
635// see init.C:xa_names, which must be kept in sync 568// see init.C:xa_names, which must be kept in sync
636enum { 569enum {
… …
640 XA_MULTIPLE, 573 XA_MULTIPLE,
641 XA_TARGETS, 574 XA_TARGETS,
642 XA_TIMESTAMP, 575 XA_TIMESTAMP,
643 XA_VT_SELECTION, 576 XA_VT_SELECTION,
644 XA_INCR, 577 XA_INCR,
578 XA_WM_PROTOCOLS,
645 XA_WMDELETEWINDOW, 579 XA_WM_DELETE_WINDOW,
646 XA_CLIPBOARD, 580 XA_CLIPBOARD,
647#if ENABLE_FRILLS 581#if ENABLE_FRILLS
582 XA_MOTIF_WM_HINTS,
583#endif
584#if ENABLE_EWMH
648 XA_NET_WM_PID, 585 XA_NET_WM_PID,
649 XA_MOTIF_WM_HINTS,
650 XA_NET_WM_NAME, 586 XA_NET_WM_NAME,
651 XA_NET_WM_ICON_NAME, 587 XA_NET_WM_ICON_NAME,
588 XA_NET_WM_PING,
652#endif 589#endif
653#if USE_XIM 590#if USE_XIM
654 XA_WM_LOCALE_NAME, 591 XA_WM_LOCALE_NAME,
655#endif 592#endif
656#if TRANSPARENT 593#if TRANSPARENT
… …
658 XA_ESETROOT_PMAP_ID, 595 XA_ESETROOT_PMAP_ID,
659#endif 596#endif
660#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 597#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
661 XA_DNDPROTOCOL, 598 XA_DNDPROTOCOL,
662 XA_DNDSELECTION, 599 XA_DNDSELECTION,
600#endif
601#if ENABLE_XEMBED
602 XA_XEMBED,
603 XA_XEMBED_INFO,
663#endif 604#endif
664 NUM_XA 605 NUM_XA
665}; 606};
666 607
667/* DEC private modes */ 608/* DEC private modes */
… …
695 priv_modes |= (bit); \ 636 priv_modes |= (bit); \
696 else \ 637 else \
697 priv_modes &= ~(bit) 638 priv_modes &= ~(bit)
698 639
699#ifdef ALLOW_132_MODE 640#ifdef ALLOW_132_MODE
700# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 641# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
701#else 642#else
702# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 643# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
703#endif 644#endif
704 645
705// do not change these constants lightly, there are many interdependencies 646// do not change these constants lightly, there are many interdependencies
706#define IMBUFSIZ 128 // input modifier buffer sizes 647#define IMBUFSIZ 128 // input modifier buffer sizes
707#define KBUFSZ 512 // size of keyboard mapping buffer 648#define KBUFSZ 512 // size of keyboard mapping buffer
708#define CBUFSIZ 4096 // size of command buffer 649#define CBUFSIZ 2048 // size of command buffer
709#define UBUFSIZ 4096 // character buffer 650#define UBUFSIZ 2048 // character buffer
710 651
711#ifndef PATH_MAX 652#ifndef PATH_MAX
712# define PATH_MAX 16384 653# define PATH_MAX 16384
713#endif 654#endif
714 655
… …
758#define strdup(x) strdup((const char *)(x)) 699#define strdup(x) strdup((const char *)(x))
759#define strlen(x) strlen((const char *)(x)) 700#define strlen(x) strlen((const char *)(x))
760#define strchr(x, y) strchr((const char *)(x), (int)(y)) 701#define strchr(x, y) strchr((const char *)(x), (int)(y))
761#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 702#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
762 703
704#define dDisp Display *disp = display->display
705
763/* convert pixel dimensions to row/column values. Everything as int32_t */ 706/* convert pixel dimensions to row/column values. Everything as int32_t */
764#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 707#define Pixel2Col(x) Pixel2Width((int32_t)(x))
765#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 708#define Pixel2Row(y) Pixel2Height((int32_t)(y))
766#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 709#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
767#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 710#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
768#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 711#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
769#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 712#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
770#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 713#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
771#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 714#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
772 715
773#define TermWin_TotalWidth() ((int32_t)TermWin.width) 716#define TermWin_TotalWidth() ((int32_t)this->width)
774#define TermWin_TotalHeight() ((int32_t)TermWin.height) 717#define TermWin_TotalHeight() ((int32_t)this->height)
718
719// for m >= -n, ensure remainder lies between 0..n-1
720#define MOD(m,n) (((m) + (n)) % (n))
721
722#define LINENO(n) MOD (term_start + int(n), total_rows)
723#define ROW(n) row_buf [LINENO (n)]
775 724
776/* how to build & extract colors and attributes */ 725/* how to build & extract colors and attributes */
777#define GET_BASEFG(x) (((x) & RS_fgMask)) 726#define GET_BASEFG(x) (((x) & RS_fgMask))
778#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 727#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 728
797#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 729#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
798#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 730#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
799 731
800#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 732#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
813 745
814#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 746#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))) 747#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
816 748
817#if ENABLE_STYLES 749#if ENABLE_STYLES
818# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 750# define FONTSET(style) fontset[GET_STYLE (style)]
819#else 751#else
820# define FONTSET(style) TermWin.fontset[0] 752# define FONTSET(style) fontset[0]
821#endif 753#endif
822 754
823#ifdef HAVE_SCROLLBARS 755#ifdef HAVE_SCROLLBARS
824# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 756# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
825#else 757#else
… …
850#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 782#define scrollbar_size() (scrollBar.end - scrollBar.beg \
851 - scrollbar_minheight ()) 783 - scrollbar_minheight ())
852 784
853#if (MENUBAR_MAX > 1) 785#if (MENUBAR_MAX > 1)
854/* rendition style flags */ 786/* rendition style flags */
855# define menuBar_height() (TermWin.fheight + SHADOW) 787# define menuBar_height() (fheight + MENU_SHADOW)
856# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 788# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
857# define isMenuBarWindow(w) ((w) == menuBar.win) 789# define isMenuBarWindow(w) ((w) == menuBar.win)
858#else 790#else
859# define menuBar_height() (0) 791# define menuBar_height() (0)
860# define menuBar_TotalHeight() (0) 792# define menuBar_TotalHeight() (0)
861# define isMenuBarWindow(w) (0) 793# define isMenuBarWindow(w) (0)
… …
864#ifdef XPM_BACKGROUND 796#ifdef XPM_BACKGROUND
865# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 797# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
866#else 798#else
867# define XPMClearArea(a, b, c, d, e, f, g) 799# define XPMClearArea(a, b, c, d, e, f, g)
868#endif 800#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 801
877#ifdef UTMP_SUPPORT 802#ifdef UTMP_SUPPORT
878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 803# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
879# undef HAVE_UTMPX_H 804# undef HAVE_UTMPX_H
880# undef HAVE_STRUCT_UTMPX 805# undef HAVE_STRUCT_UTMPX
… …
914#endif 839#endif
915 840
916extern class rxvt_failure_exception { } rxvt_failure_exception; 841extern class rxvt_failure_exception { } rxvt_failure_exception;
917 842
918typedef callback1<void, const char *> log_callback; 843typedef callback1<void, const char *> log_callback;
844typedef callback1<int, int> getfd_callback;
919 845
920extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 846extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
921extern void rxvt_log (const char *fmt, ...); 847extern void rxvt_log (const char *fmt, ...);
922extern void rxvt_warn (const char *fmt, ...); 848extern void rxvt_warn (const char *fmt, ...);
923extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 849extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
924extern void rxvt_exit_failure () __attribute__ ((noreturn)); 850extern void rxvt_exit_failure () __attribute__ ((noreturn));
925 851
926#define SET_LOCALE(locale) rxvt_set_locale (locale) 852#define SET_LOCALE(locale) rxvt_set_locale (locale)
927extern bool rxvt_set_locale (const char *locale); 853extern bool rxvt_set_locale (const char *locale);
854extern bool rxvt_push_locale (const char *locale);
855extern void rxvt_pop_locale ();
928 856
929/* 857/*
930 ***************************************************************************** 858 *****************************************************************************
931 * VARIABLES 859 * VARIABLES
932 ***************************************************************************** 860 *****************************************************************************
… …
994 922
995extern class rxvt_composite_vec rxvt_composite; 923extern class rxvt_composite_vec rxvt_composite;
996#endif 924#endif
997 925
998 926
927#ifdef KEYSYM_RESOURCE
928 class keyboard_manager;
929#endif
930
999struct rxvt_term : zero_initialized, rxvt_vars { 931struct rxvt_term : zero_initialized, rxvt_vars {
1000 log_callback *log_hook; // log error messages through this hook, if != 0 932 log_callback *log_hook; // log error messages through this hook, if != 0
933 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
934
935#if ENABLE_PERL
936 void *self; // perl's $self
937#endif
1001 938
1002 struct mbstate mbstate; // current input multibyte state 939 struct mbstate mbstate; // current input multibyte state
1003 940
1004 unsigned char want_refresh:1, 941 unsigned char want_refresh:1,
1005#ifdef TRANSPARENT 942#ifdef TRANSPARENT
… …
1020 hidden_text:1, 957 hidden_text:1,
1021#endif 958#endif
1022#ifdef POINTER_BLANK 959#ifdef POINTER_BLANK
1023 hidden_pointer:1, 960 hidden_pointer:1,
1024#endif 961#endif
1025// enc_utf8:1, /* wether locale uses utf-8 */ 962 enc_utf8:1, /* wether locale uses utf-8 */
1026 seen_input:1, /* wether we have seen some program output yet */ 963 seen_input:1, /* wether we have seen some program output yet */
1027 seen_resize:1, /* wether we had a resize event */ 964 seen_resize:1, /* wether we had a resize event */
1028 parsed_geometry:1; 965 parsed_geometry:1;
1029 966
1030 unsigned char refresh_type, 967 unsigned char refresh_type,
… …
1076# ifdef POINTER_BLANK 1013# ifdef POINTER_BLANK
1077 pointerBlankDelay, 1014 pointerBlankDelay,
1078# endif 1015# endif
1079 allowedxerror; 1016 allowedxerror;
1080/* ---------- */ 1017/* ---------- */
1081 unsigned int ModMetaMask, 1018 unsigned int ModLevel3Mask,
1019 ModMetaMask,
1082 ModNumLockMask; 1020 ModNumLockMask;
1083 int old_width, /* last used width in screen resize */ 1021 int old_width, /* last used width in screen resize */
1084 old_height; /* last used height in screen resize */ 1022 old_height; /* last used height in screen resize */
1085 unsigned long priv_modes, 1023 unsigned long priv_modes,
1086 SavedModes; 1024 SavedModes;
… …
1120 pid_t cmd_pid; /* process id of child */ 1058 pid_t cmd_pid; /* process id of child */
1121 char * incr_buf; 1059 char * incr_buf;
1122 size_t incr_buf_size, incr_buf_fill; 1060 size_t incr_buf_size, incr_buf_fill;
1123/* ---------- */ 1061/* ---------- */
1124 Cursor leftptr_cursor; 1062 Cursor leftptr_cursor;
1125#ifdef POINTER_BLANK
1126 Cursor blank_cursor;
1127#endif
1128/* ---------- */ 1063/* ---------- */
1129#ifndef NO_BACKSPACE_KEY 1064#ifndef NO_BACKSPACE_KEY
1130 const char *key_backspace; 1065 const char *key_backspace;
1131#endif 1066#endif
1132#ifndef NO_DELETE_KEY 1067#ifndef NO_DELETE_KEY
… …
1177 void scr_overlay_off (); 1112 void scr_overlay_off ();
1178 void scr_overlay_set (int x, int y, 1113 void scr_overlay_set (int x, int y,
1179 text_t text, 1114 text_t text,
1180 rend_t rend = OVERLAY_RSTYLE); 1115 rend_t rend = OVERLAY_RSTYLE);
1181 void scr_overlay_set (int x, int y, const char *s); 1116 void scr_overlay_set (int x, int y, const char *s);
1117 void scr_overlay_set (int x, int y, const wchar_t *s);
1182#endif 1118#endif
1183 1119
1184 vector<void *> allocated; // free these memory blocks with free() 1120 vector<void *> allocated; // free these memory blocks with free()
1185 1121
1186 char *env_windowid; /* environmental variable WINDOWID */ 1122 char *env_windowid; /* environmental variable WINDOWID */
… …
1190 char *locale; 1126 char *locale;
1191 char charsets[4]; 1127 char charsets[4];
1192 unsigned char *v_buffer; /* pointer to physical buffer */ 1128 unsigned char *v_buffer; /* pointer to physical buffer */
1193 unsigned int v_buflen; /* size of area to write */ 1129 unsigned int v_buflen; /* size of area to write */
1194 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1131
1195#ifdef KEYSYM_RESOURCE 1132#ifdef KEYSYM_RESOURCE
1196 const unsigned char *Keysym_map[256]; 1133 keyboard_manager *keyboard;
1197#endif 1134#endif
1135
1198 const char *rs[NUM_RESOURCES]; 1136 const char *rs[NUM_RESOURCES];
1199 /* command input buffering */ 1137 /* command input buffering */
1200 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1138 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1201 unsigned char cmdbuf_base[CBUFSIZ]; 1139 unsigned char cmdbuf_base[CBUFSIZ];
1202 1140
… …
1209 // ISO 14755 entry support 1147 // ISO 14755 entry support
1210 unicode_t iso14755buf; 1148 unicode_t iso14755buf;
1211 void commit_iso14755 (); 1149 void commit_iso14755 ();
1212 int hex_keyval (XKeyEvent &ev); 1150 int hex_keyval (XKeyEvent &ev);
1213# if ISO_14755 1151# if ISO_14755
1214 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1152 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1215 void iso14755_54 (int x, int y); 1153 void iso14755_54 (int x, int y);
1216# endif 1154# endif
1217#endif 1155#endif
1218 1156
1219 // modifies first argument(!) 1157 // modifies first argument(!)
… …
1223 1161
1224#if TRANSPARENT 1162#if TRANSPARENT
1225 void rootwin_cb (XEvent &xev); 1163 void rootwin_cb (XEvent &xev);
1226 xevent_watcher rootwin_ev; 1164 xevent_watcher rootwin_ev;
1227#endif 1165#endif
1228
1229
1230 void sig_term (sig_watcher &w); sig_watcher sw_term;
1231 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1232 1166
1233 void x_cb (XEvent &xev); 1167 void x_cb (XEvent &xev);
1234 xevent_watcher termwin_ev; 1168 xevent_watcher termwin_ev;
1235 xevent_watcher vt_ev; 1169 xevent_watcher vt_ev;
1236#ifdef HAVE_SCROLLBARS 1170#ifdef HAVE_SCROLLBARS
… …
1277 1211
1278 void tt_winch (); 1212 void tt_winch ();
1279 1213
1280 rxvt_term (); 1214 rxvt_term ();
1281 ~rxvt_term (); 1215 ~rxvt_term ();
1216 void child_exit (); // child has exited, usually destroys
1282 void destroy (); 1217 void destroy ();
1218 void emergency_cleanup ();
1283 1219
1284 bool init (int argc, const char *const *argv); 1220 bool init (int argc, const char *const *argv);
1285 bool init_vars (); 1221 bool init_vars ();
1286 1222
1287 bool pty_fill (); 1223 bool pty_fill ();
… …
1296 int run_child (const char *const *argv); 1232 int run_child (const char *const *argv);
1297 1233
1298 void color_aliases (int idx); 1234 void color_aliases (int idx);
1299 void recolour_cursor (); 1235 void recolour_cursor ();
1300 void create_windows (int argc, const char *const *argv); 1236 void create_windows (int argc, const char *const *argv);
1301 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1237 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1302 void window_calc (unsigned int width, unsigned int height); 1238 void window_calc (unsigned int newwidth, unsigned int newheight);
1303 1239
1304#if USE_XIM 1240#if USE_XIM
1305 rxvt_xim *input_method; 1241 rxvt_xim *input_method;
1306 XIC Input_Context; 1242 XIC Input_Context;
1307 XIMStyle input_style; 1243 XIMStyle input_style;
… …
1341 1277
1342 bool cmd_parse (); 1278 bool cmd_parse ();
1343 void mouse_report (XButtonEvent &ev); 1279 void mouse_report (XButtonEvent &ev);
1344 void button_press (XButtonEvent &ev); 1280 void button_press (XButtonEvent &ev);
1345 void button_release (XButtonEvent &ev); 1281 void button_release (XButtonEvent &ev);
1282 void focus_in ();
1283 void focus_out ();
1346 int check_our_parents (); 1284 int check_our_parents ();
1347#ifdef PRINTPIPE 1285#ifdef PRINTPIPE
1348 FILE *popen_printer (); 1286 FILE *popen_printer ();
1349 int pclose_printer (FILE *stream); 1287 int pclose_printer (FILE *stream);
1350#endif 1288#endif
… …
1377 void set_title (const char *str); 1315 void set_title (const char *str);
1378 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1379 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1380 void set_colorfgbg (); 1318 void set_colorfgbg ();
1381 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1319 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1382 void set_widthheight (unsigned int width, unsigned int height); 1320 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1383 1321
1384#ifdef MENUBAR 1322#ifdef MENUBAR
1385 // menubar.C 1323 // menubar.C
1386 void menuitem_free (menu_t *menu, menuitem_t *item); 1324 void menuitem_free (menu_t *menu, menuitem_t *item);
1387 int action_dispatch (action_t *action); 1325 int action_dispatch (action_t *action);
… …
1413 void menubar_control (XButtonEvent &ev); 1351 void menubar_control (XButtonEvent &ev);
1414 void map_menuBar (int map); 1352 void map_menuBar (int map);
1415#endif 1353#endif
1416 1354
1417 // screen.C 1355 // screen.C
1418 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1356
1419 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1357 void lalloc (line_t &l)
1358 {
1359 l.t = (text_t *)talloc->alloc ();
1360 l.r = (rend_t *)ralloc->alloc ();
1361 }
1362
1363#if 0
1364 void lfree (line_t &l)
1365 {
1366 talloc->free (l.t);
1367 ralloc->free (l.r);
1368 }
1369#endif
1370
1371 void lresize (line_t &l)
1372 {
1373 if (!l.t)
1374 return;
1375
1376 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1377 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1378
1379 l.l = min (l.l, ncol);
1380
1381 if (ncol > prev_ncol)
1382 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1383 }
1384
1385 int fgcolor_of (rend_t r)
1386 {
1387 int base = GET_BASEFG (r);
1388#ifndef NO_BRIGHTCOLOR
1389 if (r & RS_Bold
1390# if ENABLE_STYLES
1391 && OPTION (Opt_intensityStyles)
1392# endif
1393 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1394 base += minBrightCOLOR - minCOLOR;
1395#endif
1396 return base;
1397 }
1398
1399 int bgcolor_of (rend_t r)
1400 {
1401 int base = GET_BASEBG (r);
1402#ifndef NO_BRIGHTCOLOR
1403 if (r & RS_Blink
1404# if ENABLE_STYLES
1405 && OPTION (Opt_intensityStyles)
1406# endif
1407 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1408 base += minBrightCOLOR - minCOLOR;
1409#endif
1410 return base;
1411 }
1412
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1414 void scr_blank_screen_mem (line_t &l, rend_t efs);
1420 int scr_scroll_text (int row1, int row2, int count, int spec); 1415 int scr_scroll_text (int row1, int row2, int count);
1421 void scr_reset (); 1416 void scr_reset ();
1422 void scr_reset_realloc ();
1423 void scr_release (); 1417 void scr_release ();
1424 void scr_clear (bool really = false); 1418 void scr_clear (bool really = false);
1425 void scr_refresh (unsigned char refresh_type); 1419 void scr_refresh (unsigned char refresh_type);
1426 bool scr_refresh_rend (rend_t mask, rend_t value); 1420 bool scr_refresh_rend (rend_t mask, rend_t value);
1427 void scr_erase_screen (int mode); 1421 void scr_erase_screen (int mode);
1422#if ENABLE_FRILLS
1423 void scr_erase_savelines ();
1424 void scr_backindex ();
1425 void scr_forwardindex ();
1426#endif
1428 void scr_touch (bool refresh); 1427 void scr_touch (bool refresh);
1429 void scr_expose (int x, int y, int width, int height, bool refresh); 1428 void scr_expose (int x, int y, int width, int height, bool refresh);
1430 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1429 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1431 void scr_recolour (); 1430 void scr_recolour ();
1432 void scr_remap_chars (); 1431 void scr_remap_chars ();
1433 void scr_remap_chars (text_t *tp, rend_t *rp); 1432 void scr_remap_chars (const line_t &l);
1434 1433
1435 void scr_poweron (); 1434 void scr_poweron ();
1436 void scr_cursor (int mode); 1435 void scr_cursor (int mode);
1437 void scr_do_wrap (); 1436 void scr_do_wrap ();
1438 int scr_change_screen (int scrn); 1437 int scr_change_screen (int scrn);
1439 void scr_color (unsigned int color, int fgbg); 1438 void scr_color (unsigned int color, int fgbg);
1440 void scr_rendition (int set, int style); 1439 void scr_rendition (int set, int style);
1441 void scr_add_lines (const unicode_t *str, int nlines, int len); 1440 void scr_add_lines (const unicode_t *str, int nlines, int len);
1442 void scr_backspace (); 1441 void scr_backspace ();
1443 void scr_tab (int count, bool ht = false); 1442 void scr_tab (int count, bool ht = false);
1444 void scr_backindex ();
1445 void scr_forwardindex ();
1446 void scr_gotorc (int row, int col, int relative); 1443 void scr_gotorc (int row, int col, int relative);
1447 void scr_index (enum page_dirn direction); 1444 void scr_index (enum page_dirn direction);
1448 void scr_erase_line (int mode); 1445 void scr_erase_line (int mode);
1449 void scr_E (); 1446 void scr_E ();
1450 void scr_insdel_lines (int count, int insdel); 1447 void scr_insdel_lines (int count, int insdel);
… …
1472 void selection_property (Window win, Atom prop); 1469 void selection_property (Window win, Atom prop);
1473 void selection_request (Time tm, int x, int y); 1470 void selection_request (Time tm, int x, int y);
1474 int selection_request_other (Atom target, int selnum); 1471 int selection_request_other (Atom target, int selnum);
1475 void selection_clear (); 1472 void selection_clear ();
1476 void selection_make (Time tm); 1473 void selection_make (Time tm);
1474 bool selection_grab (Time tm);
1477 void selection_start_colrow (int col, int row); 1475 void selection_start_colrow (int col, int row);
1478 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1476 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1479 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1477 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1480 void selection_remove_trailing_spaces (); 1478 void selection_remove_trailing_spaces ();
1481 void selection_send (const XSelectionRequestEvent &rq); 1479 void selection_send (const XSelectionRequestEvent &rq);
… …
1511 1509
1512 // xdefaults.C 1510 // xdefaults.C
1513 void get_options (int argc, const char *const *argv); 1511 void get_options (int argc, const char *const *argv);
1514 int parse_keysym (const char *str, const char *arg); 1512 int parse_keysym (const char *str, const char *arg);
1515 void get_xdefaults (FILE *stream, const char *name); 1513 void get_xdefaults (FILE *stream, const char *name);
1516 void extract_resources (Display *display, const char *name); 1514 void extract_resources ();
1517 // xpm.C 1515 // xpm.C
1518 int scale_pixmap (const char *geom); 1516 int scale_pixmap (const char *geom);
1519 void resize_pixmap (); 1517 void resize_pixmap ();
1520 Pixmap set_bgPixmap (const char *file); 1518 Pixmap set_bgPixmap (const char *file);
1521}; 1519};

Diff Legend

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