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.382 by root, Tue Mar 30 22:46:25 2010 UTC vs.
Revision 1.427 by sf-exg, Mon Jan 10 14:07:19 2011 UTC

… …
27#else 27#else
28// stdlib.h might provide it 28// stdlib.h might provide it
29#endif 29#endif
30 30
31using namespace std; 31using namespace std;
32
33// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 34
33extern "C" { 35extern "C" {
34#include <X11/Xlib.h> 36#include <X11/Xlib.h>
35#include <X11/Xutil.h> 37#include <X11/Xutil.h>
36#include <X11/Xresource.h> 38#include <X11/Xresource.h>
… …
97/* 99/*
98 ***************************************************************************** 100 *****************************************************************************
99 * SYSTEM HACKS 101 * SYSTEM HACKS
100 ***************************************************************************** 102 *****************************************************************************
101 */ 103 */
102
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106 104
107#include <termios.h> 105#include <termios.h>
108 106
109#include "background.h" 107#include "background.h"
110 108
… …
155void rxvt_warn (const char *fmt,...) NOTHROW; 153void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 154void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 155void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158 156
159char * rxvt_strtrim (char *str) NOTHROW; 157char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 158char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 159
160static inline void
161rxvt_free_strsplit (char **ptr) NOTHROW
162{
163 free (ptr[0]);
164 free (ptr);
165}
162 166
163void * rxvt_malloc (size_t size); 167void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 168void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 169void * rxvt_realloc (void *ptr, size_t size);
166 170
… …
189#else 193#else
190 if (envv) 194 if (envv)
191#endif 195#endif
192 environ = envv; 196 environ = envv;
193} 197}
198
199struct localise_env
200{
201 char **orig_env;
202
203 localise_env (char **new_env)
204 {
205 orig_env = environ;
206 environ = new_env;
207 }
208
209 ~localise_env ()
210 {
211 environ = orig_env;
212 }
213};
194 214
195/* 215/*
196 ***************************************************************************** 216 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 217 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 218 *****************************************************************************
… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 267# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 268#else
249# define COLORTERMENVFULL COLORTERMENV 269# define COLORTERMENVFULL COLORTERMENV
250#endif 270#endif
251#ifndef TERMENV 271#ifndef TERMENV
272# if USE_256_COLORS
273# define TERMENV "rxvt-unicode-256color"
274# else
252# define TERMENV "rxvt-unicode" 275# define TERMENV "rxvt-unicode"
276# endif
253#endif 277#endif
254 278
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 279#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 280# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 281#endif
… …
304enum { 328enum {
305 PRIMARY = 0, 329 PRIMARY = 0,
306 SECONDARY, 330 SECONDARY,
307}; 331};
308 332
333// define various rendition bits and masks. the rendition word
334// is 32 bits in size, and we should use it as efficiently as possible
335
309#define RS_None 0 336#define RS_None 0
310 337
311#define RS_fgMask 0x0000007fUL // 128 colors 338// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_bgMask 0x00003f80UL // 128 colors 339#define RS_colorMask ((1UL << Color_Bits) - 1UL)
340#define RS_bgShift 0
341#define RS_fgShift (RS_bgShift + Color_Bits)
342#define RS_bgMask (RS_colorMask << RS_bgShift)
343#define RS_fgMask (RS_colorMask << RS_fgShift)
344
345// must have space for rxvt_fontset::fontCount * 2 + 2 values
346#define RS_fontShift (RS_fgShift + Color_Bits)
347#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
348#define RS_fontCount rxvt_fontset::fontCount
349#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
350
351// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
352#define RS_redraw (2UL << RS_fontShift)
353
354#define RS_Sel (1UL << 22)
355
356// 4 custom bits for extensions
357#define RS_customCount 16UL
358#define RS_customShift 23
359#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
313 360
314// font styles 361// font styles
315#define RS_Bold 0x00004000UL // value 1 362#define RS_Bold (1UL << RS_styleShift)
316#define RS_Italic 0x00008000UL // value 2 363#define RS_Italic (2UL << RS_styleShift)
364
365#define RS_styleCount 4
366#define RS_styleShift 27
367#define RS_styleMask (RS_Bold | RS_Italic)
317 368
318// fake styles 369// fake styles
319#define RS_Blink 0x00010000UL // blink 370#define RS_Blink (1UL << 29)
320#define RS_RVid 0x00020000UL // reverse video 371#define RS_RVid (1UL << 30) // reverse video
321#define RS_Uline 0x00040000UL // underline 372#define RS_Uline (1UL << 31) // underline
322
323// toggle this to force redraw, must be != RS_Careful
324#define RS_redraw 0x01000000UL
325
326// 5 custom bits for extensions
327#define RS_customCount 32
328#define RS_customMask 0x00f80000UL
329#define RS_customShift 19
330
331// other flags
332#define RS_Careful 0x80000000UL /* be careful when drawing these */
333
334#define RS_styleCount 4
335#define RS_styleMask (RS_Bold | RS_Italic)
336#define RS_styleShift 14
337 373
338#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 374#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
339#define RS_attrMask (RS_baseattrMask | RS_fontMask) 375#define RS_attrMask (RS_baseattrMask | RS_fontMask)
340 376
341#define RS_fontCount rxvt_fontset::fontCount
342#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
343#define RS_fontShift 24
344
345#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 377#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
346#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 378#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
347 379
348#define Sel_none 0 /* Not waiting */ 380#define Sel_none 0 /* Not waiting */
349#define Sel_normal 0x01 /* normal selection */ 381#define Sel_normal 0x01 /* normal selection */
350#define Sel_incr 0x02 /* incremental selection */ 382#define Sel_incr 0x02 /* incremental selection */
351#define Sel_direct 0x00 383#define Sel_direct 0x00
… …
380 XTerm_Color_cursor = 12, // change actual 'Cursor' color 412 XTerm_Color_cursor = 12, // change actual 'Cursor' color
381 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 413 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
382 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 414 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
383 XTerm_Color05 = 15, // not implemented (tektronix fg) 415 XTerm_Color05 = 15, // not implemented (tektronix fg)
384 XTerm_Color06 = 16, // not implemented (tektronix bg) 416 XTerm_Color06 = 16, // not implemented (tektronix bg)
385 XTerm_Color_RV = 17, // change actual 'Highlight' color 417 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
418 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
386 XTerm_logfile = 46, // not implemented 419 XTerm_logfile = 46, // not implemented
387 XTerm_font = 50, 420 XTerm_font = 50,
388 421
389 XTerm_konsole30 = 30, // reserved for konsole 422 XTerm_konsole30 = 30, // reserved for konsole
390 XTerm_konsole31 = 31, // reserved for konsole 423 XTerm_konsole31 = 31, // reserved for konsole
… …
392 /* 425 /*
393 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 426 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
394 */ 427 */
395 428
396 // deprecated 429 // deprecated
397 Rxvt_Color_BD = 18,
398 Rxvt_Color_UL = 19,
399 Rxvt_restoreFG = 39, 430 Rxvt_restoreFG = 39,
400 Rxvt_restoreBG = 49, 431 Rxvt_restoreBG = 49,
401 432
402 Rxvt_Pixmap = 20, // new bg pixmap 433 Rxvt_Pixmap = 20, // new bg pixmap
403 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 434 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
457 Color_White = maxBrightCOLOR, 488 Color_White = maxBrightCOLOR,
458#else 489#else
459 Color_White = maxCOLOR, 490 Color_White = maxCOLOR,
460#endif 491#endif
461 minTermCOLOR = Color_White + 1, 492 minTermCOLOR = Color_White + 1,
493#if USE_256_COLORS
494 maxTermCOLOR = Color_White + 240,
495#else
462 maxTermCOLOR = Color_White + 72, 496 maxTermCOLOR = Color_White + 72,
497#endif
463#ifndef NO_CURSORCOLOR 498#ifndef NO_CURSORCOLOR
464 Color_cursor, 499 Color_cursor,
465 Color_cursor2, 500 Color_cursor2,
466#endif 501#endif
467 Color_pointer_fg, 502 Color_pointer_fg,
… …
476#if ENABLE_FRILLS 511#if ENABLE_FRILLS
477 Color_underline, 512 Color_underline,
478#endif 513#endif
479#ifdef OPTION_HC 514#ifdef OPTION_HC
480 Color_HC, 515 Color_HC,
516 Color_HTC,
481#endif 517#endif
482 Color_scroll, 518 Color_scroll,
483#ifdef RXVT_SCROLLBAR 519#ifdef RXVT_SCROLLBAR
484 Color_trough, 520 Color_trough,
485#endif 521#endif
… …
497#else 533#else
498 TOTAL_COLORS = NRS_COLORS 534 TOTAL_COLORS = NRS_COLORS
499#endif 535#endif
500}; 536};
501 537
538#if USE_256_COLORS
539# define Color_Bits 9 // 0 .. maxTermCOLOR
540#else
502#define Color_Bits 7 // 0 .. maxTermCOLOR 541# define Color_Bits 7 // 0 .. maxTermCOLOR
542#endif
503 543
504/* 544/*
505 * Resource list 545 * Resource list
506 */ 546 */
507enum { 547enum {
… …
535#define PrivMode_vt52 (1UL<<18) 575#define PrivMode_vt52 (1UL<<18)
536#define PrivMode_LFNL (1UL<<19) 576#define PrivMode_LFNL (1UL<<19)
537#define PrivMode_MouseBtnEvent (1UL<<20) 577#define PrivMode_MouseBtnEvent (1UL<<20)
538#define PrivMode_MouseAnyEvent (1UL<<21) 578#define PrivMode_MouseAnyEvent (1UL<<21)
539#define PrivMode_BracketPaste (1UL<<22) 579#define PrivMode_BracketPaste (1UL<<22)
580#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
581#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
540 582
541#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 583#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
542 584
543#ifdef ALLOW_132_MODE 585#ifdef ALLOW_132_MODE
544# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 586# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
595/* 637/*
596 ***************************************************************************** 638 *****************************************************************************
597 * MACRO DEFINES 639 * MACRO DEFINES
598 ***************************************************************************** 640 *****************************************************************************
599 */ 641 */
642
643// speed hack, copy some member variable into a local variable of the same name
600#define dLocal(type,name) type const name = this->name 644#define dLocal(type,name) type const name = this->name
601 645
602// for speed reasons, we assume that all codepoints 32 to 126 are 646// for speed reasons, we assume that all codepoints 32 to 126 are
603// single-width. 647// single-width.
604#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 648#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
618 662
619#define LINENO(n) LINENO_of (this, n) 663#define LINENO(n) LINENO_of (this, n)
620#define ROW(n) ROW_of (this, n) 664#define ROW(n) ROW_of (this, n)
621 665
622/* how to build & extract colors and attributes */ 666/* how to build & extract colors and attributes */
623#define GET_BASEFG(x) (((x) & RS_fgMask)) 667#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
624#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 668#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
625 669
626#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 670#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
627#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 671#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
628 672
629#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 673#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
630#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 674#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
631 675
632#define GET_ATTR(x) (((x) & RS_attrMask)) 676#define GET_ATTR(x) (((x) & RS_attrMask))
677// return attributes defining the background, encoding doesn't matter
678// depends on RS_fgShift > RS_bgShift
633#define GET_BGATTR(x) \ 679#define GET_BGATTR(x) \
680 (expect_false ((x) & RS_RVid) \
634 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 681 ? (((x) & (RS_attrMask & ~RS_RVid)) \
635 | (((x) & RS_fgMask)<<Color_Bits)) \ 682 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
636 : ((x) & (RS_attrMask | RS_bgMask))) 683 : ((x) & (RS_attrMask | RS_bgMask)))
637#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 684#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
638#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 685#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
639#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 686#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
640 687
641#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 688#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
642 689
643#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 690#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
782{ 829{
783 int x, y, w, h; // overlay dimensions 830 int x, y, w, h; // overlay dimensions
784 text_t **text; 831 text_t **text;
785 rend_t **rend; 832 rend_t **rend;
786 833
787 // while tempting to add swap() etc. here, it effetcively only increases code size 834 // while tempting to add swap() etc. here, it effectively only increases code size
788}; 835};
789 836
790/* ------------------------------------------------------------------------- */ 837/* ------------------------------------------------------------------------- */
791 838
792typedef struct 839typedef struct
… …
924#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 971#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
925#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 972#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
926 973
927/* rxvt_vars.options */ 974/* rxvt_vars.options */
928enum { 975enum {
929# define def(name,idx) Opt_ ## name = idx,
930# define nodef(name) Opt_ ## name = 0, 976# define def(name) Opt_ ## name,
977# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
978 Opt_0,
931# include "optinc.h" 979# include "optinc.h"
932# undef nodef 980# undef nodef
933# undef def 981# undef def
934Opt_count 982 Opt_count
935}; 983};
936 984
937/* ------------------------------------------------------------------------- */ 985/* ------------------------------------------------------------------------- */
938 986
939struct rxvt_vars : TermWin_t 987struct rxvt_vars : TermWin_t
… …
941 scrollBar_t scrollBar; 989 scrollBar_t scrollBar;
942 uint8_t options[(Opt_count + 7) >> 3]; 990 uint8_t options[(Opt_count + 7) >> 3];
943 XSizeHints szHint; 991 XSizeHints szHint;
944 rxvt_color *pix_colors; 992 rxvt_color *pix_colors;
945 Cursor TermWin_cursor; /* cursor for vt window */ 993 Cursor TermWin_cursor; /* cursor for vt window */
946 int numlock_state;
947 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 994 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
948 line_t *drawn_buf; // text on screen 995 line_t *drawn_buf; // text on screen
949 line_t *swap_buf; // lines for swap buffer 996 line_t *swap_buf; // lines for swap buffer
950 char *tabs; /* per location: 1 == tab-stop */ 997 char *tabs; /* per location: 1 == tab-stop */
951 screen_t screen; 998 screen_t screen;
… …
986 hidden_text:1, 1033 hidden_text:1,
987#endif 1034#endif
988#if POINTER_BLANK 1035#if POINTER_BLANK
989 hidden_pointer:1, 1036 hidden_pointer:1,
990#endif 1037#endif
991 enc_utf8:1, /* wether locale uses utf-8 */ 1038 enc_utf8:1, /* whether locale uses utf-8 */
992 seen_input:1, /* wether we have seen some program output yet */ 1039 seen_input:1, /* whether we have seen some program output yet */
993 seen_resize:1, /* wether we had a resize event */ 1040 seen_resize:1, /* whether we had a resize event */
994 parsed_geometry:1; 1041 parsed_geometry:1;
995 1042
996 unsigned char refresh_type, 1043 unsigned char refresh_type,
997#ifdef META8_OPTION 1044#ifdef META8_OPTION
998 meta_char, /* Alt-key prefix */ 1045 meta_char, /* Alt-key prefix */
… …
1050 char * incr_buf; 1097 char * incr_buf;
1051 size_t incr_buf_size, incr_buf_fill; 1098 size_t incr_buf_size, incr_buf_fill;
1052/* ---------- */ 1099/* ---------- */
1053 struct mouse_event MEvent; 1100 struct mouse_event MEvent;
1054 XComposeStatus compose; 1101 XComposeStatus compose;
1055 struct termios tio; 1102 static struct termios def_tio;
1056 row_col_t oldcursor; 1103 row_col_t oldcursor;
1057#ifdef HAVE_BG_PIXMAP 1104#ifdef HAVE_BG_PIXMAP
1058 bgPixmap_t bgPixmap; 1105 bgPixmap_t bgPixmap;
1059#endif 1106#endif
1060#ifdef HAVE_AFTERIMAGE 1107#ifdef HAVE_AFTERIMAGE
… …
1134 void rootwin_cb (XEvent &xev); 1181 void rootwin_cb (XEvent &xev);
1135 xevent_watcher rootwin_ev; 1182 xevent_watcher rootwin_ev;
1136#endif 1183#endif
1137#ifdef HAVE_BG_PIXMAP 1184#ifdef HAVE_BG_PIXMAP
1138 void update_background (); 1185 void update_background ();
1139#if TRACE_PIXMAPS
1140 void trace_update_background (const char *file, int line);
1141# define update_background() trace_update_background (__FILE__, __LINE__)
1142#endif
1143 void update_background_cb (ev::timer &w, int revents); 1186 void update_background_cb (ev::timer &w, int revents);
1144 ev::timer update_background_ev; 1187 ev::timer update_background_ev;
1145#endif 1188#endif
1146 1189
1147 void x_cb (XEvent &xev); 1190 void x_cb (XEvent &xev);
… …
1273 int run_child (const char *const *argv); 1316 int run_child (const char *const *argv);
1274 void color_aliases (int idx); 1317 void color_aliases (int idx);
1275 void create_windows (int argc, const char *const *argv); 1318 void create_windows (int argc, const char *const *argv);
1276 void get_colours (); 1319 void get_colours ();
1277 void get_ourmods (); 1320 void get_ourmods ();
1321 void set_icon (const char *file);
1278 // main.C 1322 // main.C
1279 void tt_winch (); 1323 void tt_winch ();
1280 rxvt_term (); 1324 rxvt_term ();
1281 ~rxvt_term (); 1325 ~rxvt_term ();
1282 void destroy (); 1326 void destroy ();
… …
1284 void recolour_cursor (); 1328 void recolour_cursor ();
1285 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1329 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1286 void window_calc (unsigned int newwidth, unsigned int newheight); 1330 void window_calc (unsigned int newwidth, unsigned int newheight);
1287 bool set_fonts (); 1331 bool set_fonts ();
1288 void set_string_property (Atom prop, const char *str, int len = -1); 1332 void set_string_property (Atom prop, const char *str, int len = -1);
1333 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1289 void set_utf8_property (Atom prop, const char *str, int len = -1); 1334 void set_utf8_property (Atom prop, const char *str, int len = -1);
1290 void set_title (const char *str); 1335 void set_title (const char *str);
1291 void set_icon_name (const char *str); 1336 void set_icon_name (const char *str);
1292 void set_window_color (int idx, const char *color); 1337 void set_window_color (int idx, const char *color);
1293 void set_colorfgbg (); 1338 void set_colorfgbg ();
1294 bool set_color (rxvt_color &color, const char *name); 1339 bool set_color (rxvt_color &color, const char *name);
1295 void alias_color (int dst, int src); 1340 void alias_color (int dst, int src);
1296 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1341 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1297 void get_window_origin (int &x, int &y); 1342 void get_window_origin (int &x, int &y);
1298 Pixmap get_pixmap_property (int prop_id); 1343 Pixmap get_pixmap_property (Atom property);
1299 1344
1300 // screen.C 1345 // screen.C
1301 1346
1302 void lalloc (line_t &l) const 1347 void lalloc (line_t &l) const
1303 { 1348 {
… …
1355 return base; 1400 return base;
1356 } 1401 }
1357 1402
1358 bool option (uint8_t opt) const NOTHROW 1403 bool option (uint8_t opt) const NOTHROW
1359 { 1404 {
1360 if (!opt)
1361 return 0;
1362
1363 --opt;
1364 return options[opt >> 3] & (1 << (opt & 7)); 1405 return options[opt >> 3] & (1 << (opt & 7));
1365 } 1406 }
1366 1407
1367 void set_option (uint8_t opt, bool set = true) NOTHROW 1408 void set_option (uint8_t opt, bool set = true) NOTHROW;
1368 {
1369 if (!opt)
1370 return;
1371
1372 --opt;
1373 if (set)
1374 options[opt >> 3] |= (1 << (opt & 7));
1375 else
1376 options[opt >> 3] &= ~(1 << (opt & 7));
1377 }
1378 1409
1379 void set_privmode (unsigned bit, int set) NOTHROW 1410 void set_privmode (unsigned bit, int set) NOTHROW
1380 { 1411 {
1381 if (set) 1412 if (set)
1382 priv_modes |= bit; 1413 priv_modes |= bit;
1383 else 1414 else
1384 priv_modes &= ~bit; 1415 priv_modes &= ~bit;
1385 } 1416 }
1386 1417
1387 // modifies first argument(!) 1418 // modifies first argument(!)
1419 void tt_paste (char *data, unsigned int len) NOTHROW;
1388 void paste (char *data, unsigned int len) NOTHROW; 1420 void paste (char *data, unsigned int len) NOTHROW;
1389 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1421 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1390 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1422 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1391 void scr_kill_char (line_t &l, int col) const NOTHROW; 1423 void scr_kill_char (line_t &l, int col) const NOTHROW;
1392 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1424 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1451 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1483 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1452 void selection_property (Window win, Atom prop) NOTHROW; 1484 void selection_property (Window win, Atom prop) NOTHROW;
1453 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1485 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1454 int selection_request_other (Atom target, int selnum) NOTHROW; 1486 int selection_request_other (Atom target, int selnum) NOTHROW;
1455 void selection_clear (bool clipboard = false) NOTHROW; 1487 void selection_clear (bool clipboard = false) NOTHROW;
1456 void clipboard_copy (Time tm);
1457 void selection_make (Time tm); 1488 void selection_make (Time tm);
1458 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1489 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1459 void selection_start_colrow (int col, int row) NOTHROW; 1490 void selection_start_colrow (int col, int row) NOTHROW;
1460 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1491 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1461 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1492 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;

Diff Legend

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