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.404 by sf-exg, Sun Apr 18 11:06:46 2010 UTC vs.
Revision 1.440 by sf-exg, Tue Apr 26 16:19:45 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>
… …
72#include <X11/cursorfont.h> 74#include <X11/cursorfont.h>
73#include <X11/keysym.h> 75#include <X11/keysym.h>
74#include <X11/keysymdef.h> 76#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 77#include <X11/Xatom.h>
76 78
79#ifdef HAVE_AFTERIMAGE
80# include <afterimage.h>
81# undef min
82# undef max
83#endif
84
85#ifdef HAVE_PIXBUF
86# include <gdk-pixbuf/gdk-pixbuf.h>
87#endif
88
89#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
90# define HAVE_BG_PIXMAP 1
91#endif
92
77#include "encoding.h" 93#include "encoding.h"
78#include "rxvtutil.h" 94#include "rxvtutil.h"
79#include "rxvtfont.h" 95#include "rxvtfont.h"
80#include "rxvttoolkit.h" 96#include "rxvttoolkit.h"
81#include "scrollbar.h" 97#include "scrollbar.h"
… …
98 ***************************************************************************** 114 *****************************************************************************
99 * SYSTEM HACKS 115 * SYSTEM HACKS
100 ***************************************************************************** 116 *****************************************************************************
101 */ 117 */
102 118
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 119#include <termios.h>
108
109#include "background.h"
110 120
111#ifndef STDIN_FILENO 121#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 122# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 123# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 124# define STDERR_FILENO 2
… …
155void rxvt_warn (const char *fmt,...) NOTHROW; 165void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 166void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 167void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158 168
159char * rxvt_strtrim (char *str) NOTHROW; 169char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 170char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 171
172static inline void
173rxvt_free_strsplit (char **ptr) NOTHROW
174{
175 free (ptr[0]);
176 free (ptr);
177}
162 178
163void * rxvt_malloc (size_t size); 179void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 180void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 181void * rxvt_realloc (void *ptr, size_t size);
166 182
… …
189#else 205#else
190 if (envv) 206 if (envv)
191#endif 207#endif
192 environ = envv; 208 environ = envv;
193} 209}
210
211struct localise_env
212{
213 char **orig_env;
214
215 localise_env (char **new_env)
216 {
217 orig_env = environ;
218 environ = new_env;
219 }
220
221 ~localise_env ()
222 {
223 environ = orig_env;
224 }
225};
194 226
195/* 227/*
196 ***************************************************************************** 228 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 229 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 230 *****************************************************************************
… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 279# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 280#else
249# define COLORTERMENVFULL COLORTERMENV 281# define COLORTERMENVFULL COLORTERMENV
250#endif 282#endif
251#ifndef TERMENV 283#ifndef TERMENV
252# ifdef USE_256_COLORS 284# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color" 285# define TERMENV "rxvt-unicode-256color"
254# else 286# else
255# define TERMENV "rxvt-unicode" 287# define TERMENV "rxvt-unicode"
256# endif 288# endif
257#endif 289#endif
… …
281/* special (internal) prefix for font commands */ 313/* special (internal) prefix for font commands */
282#define FONT_CMD '#' 314#define FONT_CMD '#'
283#define FONT_DN "#-" 315#define FONT_DN "#-"
284#define FONT_UP "#+" 316#define FONT_UP "#+"
285 317
286/* flags for rxvt_scr_gotorc () */ 318/* flags for rxvt_term::scr_gotorc () */
287enum { 319enum {
288 C_RELATIVE = 1, /* col movement is relative */ 320 C_RELATIVE = 1, /* col movement is relative */
289 R_RELATIVE = 2, /* row movement is relative */ 321 R_RELATIVE = 2, /* row movement is relative */
290 RELATIVE = C_RELATIVE | R_RELATIVE, 322 RELATIVE = C_RELATIVE | R_RELATIVE,
291}; 323};
292 324
293/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 325/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294enum { 326enum {
295 INSERT = -1, /* don't change these values */ 327 INSERT = -1, /* don't change these values */
296 DELETE = +1, 328 DELETE = +1,
297 ERASE = +2, 329 ERASE = +2,
298}; 330};
299 331
300/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 332/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301enum page_dirn { 333enum page_dirn {
302 UP, 334 UP,
303 DN, 335 DN,
304 NO_DIR, 336 NO_DIR,
305}; 337};
306 338
307/* arguments for rxvt_scr_change_screen () */ 339/* arguments for rxvt_term::scr_change_screen () */
308enum { 340enum {
309 PRIMARY = 0, 341 PRIMARY = 0,
310 SECONDARY, 342 SECONDARY,
311}; 343};
312 344
… …
323#define RS_fgMask (RS_colorMask << RS_fgShift) 355#define RS_fgMask (RS_colorMask << RS_fgShift)
324 356
325// must have space for rxvt_fontset::fontCount * 2 + 2 values 357// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits) 358#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 359#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
360#define RS_fontCount rxvt_fontset::fontCount
328#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful 361#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
329 362
330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 363// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
331#define RS_redraw (2UL << RS_fontShift) 364#define RS_redraw (2UL << RS_fontShift)
332 365
333#define RS_Sel (1UL << 22) 366#define RS_Sel (1UL << 22)
334 367
335// 5 custom bits for extensions 368// 4 custom bits for extensions
336#define RS_customCount 16UL 369#define RS_customCount 16UL
337#define RS_customShift 23 370#define RS_customShift 23
338#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 371#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
339 372
340// font styles 373// font styles
… …
353#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 386#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
354#define RS_attrMask (RS_baseattrMask | RS_fontMask) 387#define RS_attrMask (RS_baseattrMask | RS_fontMask)
355 388
356#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 389#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
357#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 390#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
358
359#define Sel_none 0 /* Not waiting */
360#define Sel_normal 0x01 /* normal selection */
361#define Sel_incr 0x02 /* incremental selection */
362#define Sel_direct 0x00
363#define Sel_Primary 0x01
364#define Sel_Secondary 0x02
365#define Sel_Clipboard 0x03
366#define Sel_whereMask 0x0f
367#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
368#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
369 391
370enum { 392enum {
371 C0_NUL = 0x00, 393 C0_NUL = 0x00,
372 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 394 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
373 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 395 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
391 XTerm_Color_cursor = 12, // change actual 'Cursor' color 413 XTerm_Color_cursor = 12, // change actual 'Cursor' color
392 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 414 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
393 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 415 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
394 XTerm_Color05 = 15, // not implemented (tektronix fg) 416 XTerm_Color05 = 15, // not implemented (tektronix fg)
395 XTerm_Color06 = 16, // not implemented (tektronix bg) 417 XTerm_Color06 = 16, // not implemented (tektronix bg)
396 XTerm_Color_HC = 17, // change actual 'Highlight' color 418 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
419 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
397 XTerm_logfile = 46, // not implemented 420 XTerm_logfile = 46, // not implemented
398 XTerm_font = 50, 421 XTerm_font = 50,
399 422
400 XTerm_konsole30 = 30, // reserved for konsole 423 XTerm_konsole30 = 30, // reserved for konsole
401 XTerm_konsole31 = 31, // reserved for konsole 424 XTerm_konsole31 = 31, // reserved for konsole
… …
466 Color_White = maxBrightCOLOR, 489 Color_White = maxBrightCOLOR,
467#else 490#else
468 Color_White = maxCOLOR, 491 Color_White = maxCOLOR,
469#endif 492#endif
470 minTermCOLOR = Color_White + 1, 493 minTermCOLOR = Color_White + 1,
471#ifndef USE_256_COLORS 494#if USE_256_COLORS
495 maxTermCOLOR = Color_White + 240,
496#else
472 maxTermCOLOR = Color_White + 72, 497 maxTermCOLOR = Color_White + 72,
473#else
474 maxTermCOLOR = Color_White + 240,
475#endif 498#endif
476#ifndef NO_CURSORCOLOR 499#ifndef NO_CURSORCOLOR
477 Color_cursor, 500 Color_cursor,
478 Color_cursor2, 501 Color_cursor2,
479#endif 502#endif
… …
511#else 534#else
512 TOTAL_COLORS = NRS_COLORS 535 TOTAL_COLORS = NRS_COLORS
513#endif 536#endif
514}; 537};
515 538
516#ifndef USE_256_COLORS 539#if USE_256_COLORS
517#define Color_Bits 7 // 0 .. maxTermCOLOR 540# define Color_Bits 9 // 0 .. maxTermCOLOR
518#else 541#else
519#define Color_Bits 9 // 0 .. maxTermCOLOR 542# define Color_Bits 7 // 0 .. maxTermCOLOR
520#endif 543#endif
521 544
522/* 545/*
523 * Resource list 546 * Resource list
524 */ 547 */
… …
553#define PrivMode_vt52 (1UL<<18) 576#define PrivMode_vt52 (1UL<<18)
554#define PrivMode_LFNL (1UL<<19) 577#define PrivMode_LFNL (1UL<<19)
555#define PrivMode_MouseBtnEvent (1UL<<20) 578#define PrivMode_MouseBtnEvent (1UL<<20)
556#define PrivMode_MouseAnyEvent (1UL<<21) 579#define PrivMode_MouseAnyEvent (1UL<<21)
557#define PrivMode_BracketPaste (1UL<<22) 580#define PrivMode_BracketPaste (1UL<<22)
581#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
582#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
558 583
559#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 584#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
560 585
561#ifdef ALLOW_132_MODE 586#ifdef ALLOW_132_MODE
562# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 587# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
613/* 638/*
614 ***************************************************************************** 639 *****************************************************************************
615 * MACRO DEFINES 640 * MACRO DEFINES
616 ***************************************************************************** 641 *****************************************************************************
617 */ 642 */
643
644// speed hack, copy some member variable into a local variable of the same name
618#define dLocal(type,name) type const name = this->name 645#define dLocal(type,name) type const name = this->name
619 646
620// for speed reasons, we assume that all codepoints 32 to 126 are 647// for speed reasons, we assume that all codepoints 32 to 126 are
621// single-width. 648// single-width.
622#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 649#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
803{ 830{
804 int x, y, w, h; // overlay dimensions 831 int x, y, w, h; // overlay dimensions
805 text_t **text; 832 text_t **text;
806 rend_t **rend; 833 rend_t **rend;
807 834
808 // while tempting to add swap() etc. here, it effetcively only increases code size 835 // while tempting to add swap() etc. here, it effectively only increases code size
809}; 836};
810 837
811/* ------------------------------------------------------------------------- */ 838/* ------------------------------------------------------------------------- */
812 839
813typedef struct 840typedef struct
… …
870 int saveLines; /* number of lines that fit in scrollback */ 897 int saveLines; /* number of lines that fit in scrollback */
871 int total_rows; /* total number of rows in this terminal */ 898 int total_rows; /* total number of rows in this terminal */
872 int term_start; /* term lines start here */ 899 int term_start; /* term lines start here */
873 int view_start; /* scrollback view starts here */ 900 int view_start; /* scrollback view starts here */
874 int top_row; /* topmost row index of scrollback */ 901 int top_row; /* topmost row index of scrollback */
875 Window parent[6]; /* parent identifiers - we're parent[0] */ 902 Window parent; /* parent identifier */
876 Window vt; /* vt100 window */ 903 Window vt; /* vt100 window */
877 GC gc; /* GC for drawing */ 904 GC gc; /* GC for drawing */
878 Pixmap pixmap; 905 Pixmap pixmap;
879 rxvt_drawable *drawable; 906 rxvt_drawable *drawable;
880 rxvt_fontset *fontset[4]; 907 rxvt_fontset *fontset[4];
… …
945#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 972#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
946#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 973#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
947 974
948/* rxvt_vars.options */ 975/* rxvt_vars.options */
949enum { 976enum {
950# define def(name,idx) Opt_ ## name = idx,
951# define nodef(name) Opt_ ## name = 0, 977# define def(name) Opt_ ## name,
978# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
979 Opt_0,
952# include "optinc.h" 980# include "optinc.h"
953# undef nodef 981# undef nodef
954# undef def 982# undef def
955Opt_count 983 Opt_count
956}; 984};
957 985
958/* ------------------------------------------------------------------------- */ 986/* ------------------------------------------------------------------------- */
959 987
960struct rxvt_vars : TermWin_t 988struct rxvt_vars : TermWin_t
… …
1013 seen_resize:1, /* whether we had a resize event */ 1041 seen_resize:1, /* whether we had a resize event */
1014 parsed_geometry:1; 1042 parsed_geometry:1;
1015 1043
1016 unsigned char refresh_type, 1044 unsigned char refresh_type,
1017#ifdef META8_OPTION 1045#ifdef META8_OPTION
1018 meta_char, /* Alt-key prefix */ 1046 meta_char; /* Alt-key prefix */
1019#endif 1047#endif
1020 selection_wait,
1021 selection_type;
1022/* ---------- */ 1048/* ---------- */
1023 bool rvideo_state, rvideo_mode; 1049 bool rvideo_state, rvideo_mode;
1024#ifndef NO_BELL 1050#ifndef NO_BELL
1025 bool rvideo_bell; 1051 bool rvideo_bell;
1026#endif 1052#endif
… …
1062 SavedModes; 1088 SavedModes;
1063/* ---------- */ 1089/* ---------- */
1064 Atom *xa; 1090 Atom *xa;
1065/* ---------- */ 1091/* ---------- */
1066 Time selection_time, 1092 Time selection_time,
1067 selection_request_time,
1068 clipboard_time; 1093 clipboard_time;
1094 rxvt_selection *selection_req;
1069 pid_t cmd_pid; /* process id of child */ 1095 pid_t cmd_pid; /* process id of child */
1070 char * incr_buf;
1071 size_t incr_buf_size, incr_buf_fill;
1072/* ---------- */ 1096/* ---------- */
1073 struct mouse_event MEvent; 1097 struct mouse_event MEvent;
1074 XComposeStatus compose; 1098 XComposeStatus compose;
1075 struct termios tio; 1099 static struct termios def_tio;
1076 row_col_t oldcursor; 1100 row_col_t oldcursor;
1077#ifdef HAVE_BG_PIXMAP 1101#ifdef HAVE_BG_PIXMAP
1078 bgPixmap_t bgPixmap; 1102 void bg_init ();
1103 void bg_destroy ();
1104
1105 enum {
1106 //subset returned by make_transparency_pixmap
1107 BG_IS_VALID = 1 << 0,
1108 BG_NEEDS_TINT = 1 << 1,
1109 BG_NEEDS_BLUR = 1 << 2,
1110
1111 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1112
1113 BG_PROP_SCALE = 1 << 3,
1114 BG_ROOT_ALIGN = 1 << 4,
1115 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN,
1116
1117 BG_TINT_SET = 1 << 5,
1118 BG_TINT_BITAND = 1 << 6,
1119 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1120
1121 BG_HAS_RENDER = 1 << 7,
1122 BG_HAS_RENDER_CONV = 1 << 8,
1123 BG_CLIENT_RENDER = 1 << 9,
1124
1125 BG_IS_TRANSPARENT = 1 << 10,
1126 BG_NEEDS_REFRESH = 1 << 11,
1127 BG_IS_SIZE_SENSITIVE = 1 << 12,
1128 BG_IS_FROM_FILE = 1 << 13,
1129 };
1130
1131 unsigned int bg_flags;
1132
1133# ifdef BG_IMAGE_FROM_FILE
1134 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1135 bool render_image (unsigned long tr_flags);
1136
1137 enum {
1138 noScale = 0,
1139 windowScale = 100,
1140 defaultScale = windowScale,
1141 centerAlign = 50,
1142 defaultAlign = centerAlign,
1143 };
1144
1145 unsigned int h_scale, v_scale; /* percents of the window size */
1146 int h_align, v_align; /* percents of the window size:
1147 0 - left align, 50 - center, 100 - right */
1148
1149 bool bg_set_geometry (const char *geom, bool update = false);
1150 void bg_set_default_geometry ()
1151 {
1152 h_scale = v_scale = defaultScale;
1153 h_align = v_align = defaultAlign;
1154 }
1155
1156 bool bg_set_file (const char *file);
1157# endif
1158
1159# ifdef ENABLE_TRANSPARENCY
1160 Pixmap root_pixmap; /* current root pixmap set */
1161 rxvt_color tint;
1162 int shade;
1163 int h_blurRadius, v_blurRadius;
1164
1165 bool bg_set_transparent ();
1166 void bg_set_root_pixmap ();
1167 void set_tint_shade_flags ();
1168 bool bg_set_tint (rxvt_color &new_tint);
1169 bool bg_set_shade (const char *shade_str);
1170 bool bg_set_blur (const char *geom);
1171
1172 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1173 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1174 unsigned long make_transparency_pixmap ();
1175# endif
1176
1177 ev_tstamp bg_valid_since;
1178
1179 Pixmap bg_pixmap;
1180 unsigned int bg_pmap_width, bg_pmap_height;
1181
1182 int target_x;
1183 int target_y;
1184 bool bg_set_position (int x, int y);
1185 bool bg_window_size_sensitive ();
1186 bool bg_window_position_sensitive ();
1187
1188 bool bg_render ();
1189 void bg_invalidate ()
1190 {
1191 bg_flags &= ~BG_IS_VALID;
1192 }
1079#endif 1193#endif
1080#ifdef HAVE_AFTERIMAGE 1194#ifdef HAVE_AFTERIMAGE
1195 ASImage *original_asim;
1081 ASVisual *asv; 1196 ASVisual *asv;
1082 ASImageManager *asimman; 1197 ASImageManager *asimman;
1083 1198
1084 void init_asv () 1199 void init_asv ()
1085 { 1200 {
1086 if (!asv) 1201 if (!asv)
1087 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1202 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1088 } 1203 }
1204#endif
1205#ifdef HAVE_PIXBUF
1206 GdkPixbuf *pixbuf;
1207 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1208 int src_x, int src_y, int dst_x, int dst_y,
1209 unsigned int width, unsigned int height);
1089#endif 1210#endif
1090 1211
1091#if ENABLE_OVERLAY 1212#if ENABLE_OVERLAY
1092 overlay_base ov; 1213 overlay_base ov;
1093 1214
… …
1154 void rootwin_cb (XEvent &xev); 1275 void rootwin_cb (XEvent &xev);
1155 xevent_watcher rootwin_ev; 1276 xevent_watcher rootwin_ev;
1156#endif 1277#endif
1157#ifdef HAVE_BG_PIXMAP 1278#ifdef HAVE_BG_PIXMAP
1158 void update_background (); 1279 void update_background ();
1159#if TRACE_PIXMAPS
1160 void trace_update_background (const char *file, int line);
1161# define update_background() trace_update_background (__FILE__, __LINE__)
1162#endif
1163 void update_background_cb (ev::timer &w, int revents); 1280 void update_background_cb (ev::timer &w, int revents);
1164 ev::timer update_background_ev; 1281 ev::timer update_background_ev;
1165#endif 1282#endif
1166 1283
1167 void x_cb (XEvent &xev); 1284 void x_cb (XEvent &xev);
… …
1172 void child_cb (ev::child &w, int revents); ev::child child_ev; 1289 void child_cb (ev::child &w, int revents); ev::child child_ev;
1173 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1290 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1174 void refresh_check (); 1291 void refresh_check ();
1175 void flush (); 1292 void flush ();
1176 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1293 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1294 void cmdbuf_reify ();
1295 void cmdbuf_append (const char *str, size_t count);
1177 bool pty_fill (); 1296 bool pty_fill ();
1178 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1297 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1179 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1180 1298
1181#ifdef CURSOR_BLINK 1299#ifdef CURSOR_BLINK
1182 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1300 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1183#endif 1301#endif
1184#ifdef TEXT_BLINK 1302#ifdef TEXT_BLINK
… …
1241#endif 1359#endif
1242 1360
1243 // command.C 1361 // command.C
1244 void key_press (XKeyEvent &ev); 1362 void key_press (XKeyEvent &ev);
1245 void key_release (XKeyEvent &ev); 1363 void key_release (XKeyEvent &ev);
1246 unsigned int cmd_write (const char *str, unsigned int count);
1247 1364
1248 wchar_t next_char () NOTHROW; 1365 wchar_t next_char () NOTHROW;
1249 wchar_t cmd_getc () THROW ((class out_of_input)); 1366 wchar_t cmd_getc () THROW ((class out_of_input));
1250 uint32_t next_octet () NOTHROW; 1367 uint32_t next_octet () NOTHROW;
1251 uint32_t cmd_get8 () THROW ((class out_of_input)); 1368 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1278 void process_color_seq (int report, int color, const char *str, char resp); 1395 void process_color_seq (int report, int color, const char *str, char resp);
1279 void process_xterm_seq (int op, char *str, char resp); 1396 void process_xterm_seq (int op, char *str, char resp);
1280 int privcases (int mode, unsigned long bit); 1397 int privcases (int mode, unsigned long bit);
1281 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1398 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1282 void process_sgr_mode (unsigned int nargs, const int *arg); 1399 void process_sgr_mode (unsigned int nargs, const int *arg);
1283 void process_graphics ();
1284 // init.C 1400 // init.C
1285 void init_vars (); 1401 void init_vars ();
1286 const char **init_resources (int argc, const char *const *argv); 1402 const char **init_resources (int argc, const char *const *argv);
1287 void init (int argc, const char *const *argv, stringvec *envv); 1403 void init (int argc, const char *const *argv, stringvec *envv);
1288 void init_env (); 1404 void init_env ();
… …
1293 int run_child (const char *const *argv); 1409 int run_child (const char *const *argv);
1294 void color_aliases (int idx); 1410 void color_aliases (int idx);
1295 void create_windows (int argc, const char *const *argv); 1411 void create_windows (int argc, const char *const *argv);
1296 void get_colours (); 1412 void get_colours ();
1297 void get_ourmods (); 1413 void get_ourmods ();
1414 void set_icon (const char *file);
1298 // main.C 1415 // main.C
1299 void tt_winch (); 1416 void tt_winch ();
1300 rxvt_term (); 1417 rxvt_term ();
1301 ~rxvt_term (); 1418 ~rxvt_term ();
1302 void destroy (); 1419 void destroy ();
… …
1304 void recolour_cursor (); 1421 void recolour_cursor ();
1305 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1422 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1306 void window_calc (unsigned int newwidth, unsigned int newheight); 1423 void window_calc (unsigned int newwidth, unsigned int newheight);
1307 bool set_fonts (); 1424 bool set_fonts ();
1308 void set_string_property (Atom prop, const char *str, int len = -1); 1425 void set_string_property (Atom prop, const char *str, int len = -1);
1426 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1309 void set_utf8_property (Atom prop, const char *str, int len = -1); 1427 void set_utf8_property (Atom prop, const char *str, int len = -1);
1310 void set_title (const char *str); 1428 void set_title (const char *str);
1311 void set_icon_name (const char *str); 1429 void set_icon_name (const char *str);
1312 void set_window_color (int idx, const char *color); 1430 void set_window_color (int idx, const char *color);
1313 void set_colorfgbg (); 1431 void set_colorfgbg ();
1314 bool set_color (rxvt_color &color, const char *name); 1432 bool set_color (rxvt_color &color, const char *name);
1315 void alias_color (int dst, int src); 1433 void alias_color (int dst, int src);
1316 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1434 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1317 void get_window_origin (int &x, int &y); 1435 void get_window_origin (int &x, int &y);
1318 Pixmap get_pixmap_property (int prop_id); 1436 Pixmap get_pixmap_property (Atom property);
1319 1437
1320 // screen.C 1438 // screen.C
1321 1439
1322 void lalloc (line_t &l) const 1440 void lalloc (line_t &l) const
1323 { 1441 {
… …
1375 return base; 1493 return base;
1376 } 1494 }
1377 1495
1378 bool option (uint8_t opt) const NOTHROW 1496 bool option (uint8_t opt) const NOTHROW
1379 { 1497 {
1380 if (!opt)
1381 return 0;
1382
1383 --opt;
1384 return options[opt >> 3] & (1 << (opt & 7)); 1498 return options[opt >> 3] & (1 << (opt & 7));
1385 } 1499 }
1386 1500
1387 void set_option (uint8_t opt, bool set = true) NOTHROW 1501 void set_option (uint8_t opt, bool set = true) NOTHROW;
1388 {
1389 if (!opt)
1390 return;
1391
1392 --opt;
1393 if (set)
1394 options[opt >> 3] |= (1 << (opt & 7));
1395 else
1396 options[opt >> 3] &= ~(1 << (opt & 7));
1397 }
1398 1502
1399 void set_privmode (unsigned bit, int set) NOTHROW 1503 void set_privmode (unsigned bit, int set) NOTHROW
1400 { 1504 {
1401 if (set) 1505 if (set)
1402 priv_modes |= bit; 1506 priv_modes |= bit;
1403 else 1507 else
1404 priv_modes &= ~bit; 1508 priv_modes &= ~bit;
1405 } 1509 }
1406 1510
1407 // modifies first argument(!) 1511 // modifies first argument(!)
1512 void tt_paste (char *data, unsigned int len) NOTHROW;
1408 void paste (char *data, unsigned int len) NOTHROW; 1513 void paste (char *data, unsigned int len) NOTHROW;
1409 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1514 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1410 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1515 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1411 void scr_kill_char (line_t &l, int col) const NOTHROW; 1516 void scr_kill_char (line_t &l, int col) const NOTHROW;
1412 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1517 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1421 void scr_backindex () NOTHROW; 1526 void scr_backindex () NOTHROW;
1422 void scr_forwardindex () NOTHROW; 1527 void scr_forwardindex () NOTHROW;
1423#endif 1528#endif
1424 void scr_touch (bool refresh) NOTHROW; 1529 void scr_touch (bool refresh) NOTHROW;
1425 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1530 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1426 void scr_recolour () NOTHROW; 1531 void scr_recolour (bool refresh = true) NOTHROW;
1427 void scr_remap_chars () NOTHROW; 1532 void scr_remap_chars () NOTHROW;
1428 void scr_remap_chars (line_t &l) NOTHROW; 1533 void scr_remap_chars (line_t &l) NOTHROW;
1429 1534
1430 enum cursor_mode { SAVE, RESTORE }; 1535 enum cursor_mode { SAVE, RESTORE };
1431 1536
… …
1466 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1571 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1467 void scr_reverse_selection () NOTHROW; 1572 void scr_reverse_selection () NOTHROW;
1468 void scr_dump (int fd) NOTHROW; 1573 void scr_dump (int fd) NOTHROW;
1469 1574
1470 void selection_check (int check_more) NOTHROW; 1575 void selection_check (int check_more) NOTHROW;
1471 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1472 void selection_property (Window win, Atom prop) NOTHROW;
1473 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1576 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1474 int selection_request_other (Atom target, int selnum) NOTHROW;
1475 void selection_clear (bool clipboard = false) NOTHROW; 1577 void selection_clear (bool clipboard = false) NOTHROW;
1476 void clipboard_copy (Time tm);
1477 void selection_make (Time tm); 1578 void selection_make (Time tm);
1478 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1579 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1479 void selection_start_colrow (int col, int row) NOTHROW; 1580 void selection_start_colrow (int col, int row) NOTHROW;
1480 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1581 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1481 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1582 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