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.435 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.466 by sf-exg, Thu Jan 19 13:33:43 2012 UTC

1#ifndef RXVT_H_ /* include once only */ 1#ifndef RXVT_H_ /* include once only */
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include <cstdio> 4#include <stdio.h>
5#include <cctype> 5#include <ctype.h>
6#include <cerrno> 6#include <errno.h>
7#include <cstdarg> 7#include <stdarg.h>
8#include <cstdlib> 8#include <stdlib.h>
9#ifdef HAVE_STDINT_H 9#ifdef HAVE_STDINT_H
10#include <stdint.h> 10#include <stdint.h>
11#endif 11#endif
12#include <sys/types.h> 12#include <sys/types.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <cstring> 14#include <string.h>
15#include <assert.h> 15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H 16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h> 17#include <sys/ioctl.h>
18#endif 18#endif
19#ifdef HAVE_SYS_STRREDIR_H 19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h> 20#include <sys/strredir.h>
21#endif 21#endif
22 22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H 23#if HAVE_WCHAR_H
26# include <wchar.h> 24# include <wchar.h>
27#else 25#else
28// stdlib.h might provide it 26// stdlib.h might provide it
29#endif 27#endif
30 28
… …
125#endif 123#endif
126 124
127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 125#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
128# define EXIT_SUCCESS 0 /* exit function success */ 126# define EXIT_SUCCESS 0 /* exit function success */
129# define EXIT_FAILURE 1 /* exit function failure */ 127# define EXIT_FAILURE 1 /* exit function failure */
130#endif
131
132#ifndef PATH_MAX
133# define PATH_MAX 16384
134#endif 128#endif
135 129
136/****************************************************************************/ 130/****************************************************************************/
137 131
138// exception thrown on fatal (per-instance) errors 132// exception thrown on fatal (per-instance) errors
… …
161 155
162const char * rxvt_basename (const char *str) NOTHROW; 156const char * rxvt_basename (const char *str) NOTHROW;
163void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
164void rxvt_log (const char *fmt,...) NOTHROW; 158void rxvt_log (const char *fmt,...) NOTHROW;
165void rxvt_warn (const char *fmt,...) NOTHROW; 159void rxvt_warn (const char *fmt,...) NOTHROW;
166void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
167void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
168 162
169char * rxvt_strtrim (char *str) NOTHROW; 163char * rxvt_strtrim (char *str) NOTHROW;
170char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 164char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
171 165
172static inline void 166static inline void
… …
308# define NSCREENS 0 302# define NSCREENS 0
309#else 303#else
310# define NSCREENS 1 304# define NSCREENS 1
311#endif 305#endif
312 306
313/* special (internal) prefix for font commands */
314#define FONT_CMD '#'
315#define FONT_DN "#-"
316#define FONT_UP "#+"
317
318/* flags for rxvt_scr_gotorc () */ 307/* flags for rxvt_term::scr_gotorc () */
319enum { 308enum {
320 C_RELATIVE = 1, /* col movement is relative */ 309 C_RELATIVE = 1, /* col movement is relative */
321 R_RELATIVE = 2, /* row movement is relative */ 310 R_RELATIVE = 2, /* row movement is relative */
322 RELATIVE = C_RELATIVE | R_RELATIVE, 311 RELATIVE = C_RELATIVE | R_RELATIVE,
323}; 312};
324 313
325/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 314/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
326enum { 315enum {
327 INSERT = -1, /* don't change these values */ 316 INSERT = -1, /* don't change these values */
328 DELETE = +1, 317 DELETE = +1,
329 ERASE = +2, 318 ERASE = +2,
330}; 319};
331 320
332/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 321/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
333enum page_dirn { 322enum page_dirn {
334 UP, 323 UP,
335 DN, 324 DN,
336 NO_DIR, 325 NO_DIR,
337}; 326};
338 327
339/* arguments for rxvt_scr_change_screen () */ 328/* arguments for rxvt_term::scr_change_screen () */
340enum { 329enum {
341 PRIMARY = 0, 330 PRIMARY = 0,
342 SECONDARY, 331 SECONDARY,
343}; 332};
344 333
… …
676 665
677#define GET_ATTR(x) (((x) & RS_attrMask)) 666#define GET_ATTR(x) (((x) & RS_attrMask))
678// return attributes defining the background, encoding doesn't matter 667// return attributes defining the background, encoding doesn't matter
679// depends on RS_fgShift > RS_bgShift 668// depends on RS_fgShift > RS_bgShift
680#define GET_BGATTR(x) \ 669#define GET_BGATTR(x) \
681 (expect_false ((x) & RS_RVid) \ 670 (ecb_unlikely ((x) & RS_RVid) \
682 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 671 ? (((x) & (RS_attrMask & ~RS_RVid)) \
683 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 672 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
684 : ((x) & (RS_attrMask | RS_bgMask))) 673 : ((x) & (RS_attrMask | RS_bgMask)))
685#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 674#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
686#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 675#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
879 * END······················= total_rows 868 * END······················= total_rows
880 */ 869 */
881 870
882struct TermWin_t 871struct TermWin_t
883{ 872{
873 int vt_width; /* actual window width [pixels] */
874 int vt_height; /* actual window height [pixels] */
884 int width; /* window width [pixels] */ 875 int width; /* window width [pixels] */
885 int height; /* window height [pixels] */ 876 int height; /* window height [pixels] */
886 int fwidth; /* font width [pixels] */ 877 int fwidth; /* font width [pixels] */
887 int fheight; /* font height [pixels] */ 878 int fheight; /* font height [pixels] */
888 int fbase; /* font ascent (baseline) [pixels] */ 879 int fbase; /* font ascent (baseline) [pixels] */
… …
897 int saveLines; /* number of lines that fit in scrollback */ 888 int saveLines; /* number of lines that fit in scrollback */
898 int total_rows; /* total number of rows in this terminal */ 889 int total_rows; /* total number of rows in this terminal */
899 int term_start; /* term lines start here */ 890 int term_start; /* term lines start here */
900 int view_start; /* scrollback view starts here */ 891 int view_start; /* scrollback view starts here */
901 int top_row; /* topmost row index of scrollback */ 892 int top_row; /* topmost row index of scrollback */
902 Window parent[6]; /* parent identifiers - we're parent[0] */ 893 Window parent; /* parent identifier */
903 Window vt; /* vt100 window */ 894 Window vt; /* vt100 window */
904 GC gc; /* GC for drawing */ 895 GC gc; /* GC for drawing */
905 Pixmap pixmap;
906 rxvt_drawable *drawable; 896 rxvt_drawable *drawable;
907 rxvt_fontset *fontset[4]; 897 rxvt_fontset *fontset[4];
908}; 898};
909 899
910/* 900/*
… …
990 scrollBar_t scrollBar; 980 scrollBar_t scrollBar;
991 uint8_t options[(Opt_count + 7) >> 3]; 981 uint8_t options[(Opt_count + 7) >> 3];
992 XSizeHints szHint; 982 XSizeHints szHint;
993 rxvt_color *pix_colors; 983 rxvt_color *pix_colors;
994 Cursor TermWin_cursor; /* cursor for vt window */ 984 Cursor TermWin_cursor; /* cursor for vt window */
995 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 985 line_t *row_buf; // all lines, scrollback + terminal, circular
996 line_t *drawn_buf; // text on screen 986 line_t *drawn_buf; // text on screen
997 line_t *swap_buf; // lines for swap buffer 987 line_t *swap_buf; // lines for swap buffer
998 char *tabs; /* per location: 1 == tab-stop */ 988 char *tabs; /* per location: 1 == tab-stop */
999 screen_t screen; 989 screen_t screen;
1000 screen_t swap; 990 screen_t swap;
… …
1037 hidden_pointer:1, 1027 hidden_pointer:1,
1038#endif 1028#endif
1039 enc_utf8:1, /* whether locale uses utf-8 */ 1029 enc_utf8:1, /* whether locale uses utf-8 */
1040 seen_input:1, /* whether we have seen some program output yet */ 1030 seen_input:1, /* whether we have seen some program output yet */
1041 seen_resize:1, /* whether we had a resize event */ 1031 seen_resize:1, /* whether we had a resize event */
1032 init_done:1,
1042 parsed_geometry:1; 1033 parsed_geometry:1;
1043 1034
1044 unsigned char refresh_type, 1035 unsigned char refresh_type,
1045#ifdef META8_OPTION 1036#ifdef META8_OPTION
1046 meta_char; /* Alt-key prefix */ 1037 meta_char; /* Alt-key prefix */
… …
1080 allowedxerror; 1071 allowedxerror;
1081/* ---------- */ 1072/* ---------- */
1082 unsigned int ModLevel3Mask, 1073 unsigned int ModLevel3Mask,
1083 ModMetaMask, 1074 ModMetaMask,
1084 ModNumLockMask; 1075 ModNumLockMask;
1085 int old_width, /* last used width in screen resize */
1086 old_height; /* last used height in screen resize */
1087 unsigned long priv_modes, 1076 unsigned long priv_modes,
1088 SavedModes; 1077 SavedModes;
1089/* ---------- */ 1078/* ---------- */
1090 Atom *xa; 1079 Atom *xa;
1091/* ---------- */ 1080/* ---------- */
1092 Time selection_time, 1081 Time selection_time,
1093 clipboard_time; 1082 clipboard_time;
1083 rxvt_selection *selection_req;
1094 pid_t cmd_pid; /* process id of child */ 1084 pid_t cmd_pid; /* process id of child */
1095/* ---------- */ 1085/* ---------- */
1096 struct mouse_event MEvent; 1086 struct mouse_event MEvent;
1097 XComposeStatus compose; 1087 XComposeStatus compose;
1098 static struct termios def_tio; 1088 static struct termios def_tio;
… …
1107 BG_NEEDS_TINT = 1 << 1, 1097 BG_NEEDS_TINT = 1 << 1,
1108 BG_NEEDS_BLUR = 1 << 2, 1098 BG_NEEDS_BLUR = 1 << 2,
1109 1099
1110 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR, 1100 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1111 1101
1112 BG_PROP_SCALE = 1 << 3, 1102 BG_KEEP_ASPECT = 1 << 3,
1113 BG_ROOT_ALIGN = 1 << 4, 1103 BG_ROOT_ALIGN = 1 << 4,
1104 BG_TILE = 1 << 14,
1114 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN, 1105 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1115 1106
1116 BG_TINT_SET = 1 << 5, 1107 BG_TINT_SET = 1 << 5,
1117 BG_TINT_BITAND = 1 << 6, 1108 BG_TINT_BITAND = 1 << 6,
1118 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND, 1109 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1119 1110
… …
1166 void set_tint_shade_flags (); 1157 void set_tint_shade_flags ();
1167 bool bg_set_tint (rxvt_color &new_tint); 1158 bool bg_set_tint (rxvt_color &new_tint);
1168 bool bg_set_shade (const char *shade_str); 1159 bool bg_set_shade (const char *shade_str);
1169 bool bg_set_blur (const char *geom); 1160 bool bg_set_blur (const char *geom);
1170 1161
1171 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1162 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1172 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1163 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1164 void tint_ximage (Visual *visual, XImage *ximage);
1173 unsigned long make_transparency_pixmap (); 1165 unsigned long make_transparency_pixmap ();
1174# endif 1166# endif
1175 1167
1176 ev_tstamp bg_valid_since; 1168 ev_tstamp bg_valid_since;
1177 1169
… …
1221 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1213 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1222#endif 1214#endif
1223 1215
1224 vector<void *> allocated; // free these memory blocks with free() 1216 vector<void *> allocated; // free these memory blocks with free()
1225 1217
1226 char env_windowid[21]; /* environmental variable WINDOWID */
1227 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1228 char *env_display; /* environmental variable DISPLAY */
1229 char *env_term; /* environmental variable TERM */
1230
1231 char *locale; 1218 char *locale;
1232 char charsets[4]; 1219 char charsets[4];
1233 char *v_buffer; /* pointer to physical buffer */ 1220 char *v_buffer; /* pointer to physical buffer */
1234 unsigned int v_buflen; /* size of area to write */ 1221 unsigned int v_buflen; /* size of area to write */
1235 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1222 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1288 void child_cb (ev::child &w, int revents); ev::child child_ev; 1275 void child_cb (ev::child &w, int revents); ev::child child_ev;
1289 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1276 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1290 void refresh_check (); 1277 void refresh_check ();
1291 void flush (); 1278 void flush ();
1292 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1279 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1280 void cmdbuf_reify ();
1281 void cmdbuf_append (const char *str, size_t count);
1293 bool pty_fill (); 1282 bool pty_fill ();
1294 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1283 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1295 1284
1296#ifdef CURSOR_BLINK 1285#ifdef CURSOR_BLINK
1297 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1286 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
… …
1320 void pointer_unblank (); 1309 void pointer_unblank ();
1321 1310
1322 void tt_printf (const char *fmt,...); 1311 void tt_printf (const char *fmt,...);
1323 void tt_write (const char *data, unsigned int len); 1312 void tt_write (const char *data, unsigned int len);
1324 void pty_write (); 1313 void pty_write ();
1325
1326 void init (stringvec *argv, stringvec *envv)
1327 {
1328 this->argv = argv;
1329 init (argv->size (), argv->begin (), envv);
1330 }
1331 1314
1332 void make_current () const // make this the "currently active" urxvt instance 1315 void make_current () const // make this the "currently active" urxvt instance
1333 { 1316 {
1334 SET_R (this); 1317 SET_R (this);
1335 set_environ (envv); 1318 set_environ (envv);
… …
1347 void im_set_size (XRectangle &size); 1330 void im_set_size (XRectangle &size);
1348 void im_set_position (XPoint &pos) NOTHROW; 1331 void im_set_position (XPoint &pos) NOTHROW;
1349 void im_set_color (unsigned long &fg, unsigned long &bg); 1332 void im_set_color (unsigned long &fg, unsigned long &bg);
1350 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1333 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1351 1334
1352 bool IMisRunning (); 1335 bool im_is_running ();
1353 void IMSendSpot (); 1336 void im_send_spot ();
1354 bool IM_get_IC (const char *modifiers); 1337 bool im_get_ic (const char *modifiers);
1355 void IMSetPosition (); 1338 void im_set_position ();
1356#endif 1339#endif
1357 1340
1358 // command.C 1341 // command.C
1359 void key_press (XKeyEvent &ev); 1342 void key_press (XKeyEvent &ev);
1360 void key_release (XKeyEvent &ev); 1343 void key_release (XKeyEvent &ev);
1361 unsigned int cmd_write (const char *str, unsigned int count);
1362 1344
1363 wchar_t next_char () NOTHROW; 1345 wchar_t next_char () NOTHROW;
1364 wchar_t cmd_getc () THROW ((class out_of_input)); 1346 wchar_t cmd_getc () THROW ((class out_of_input));
1365 uint32_t next_octet () NOTHROW; 1347 uint32_t next_octet () NOTHROW;
1366 uint32_t cmd_get8 () THROW ((class out_of_input)); 1348 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1393 void process_color_seq (int report, int color, const char *str, char resp); 1375 void process_color_seq (int report, int color, const char *str, char resp);
1394 void process_xterm_seq (int op, char *str, char resp); 1376 void process_xterm_seq (int op, char *str, char resp);
1395 int privcases (int mode, unsigned long bit); 1377 int privcases (int mode, unsigned long bit);
1396 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1378 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1397 void process_sgr_mode (unsigned int nargs, const int *arg); 1379 void process_sgr_mode (unsigned int nargs, const int *arg);
1398 void process_graphics ();
1399 // init.C 1380 // init.C
1381 void init (stringvec *argv, stringvec *envv);
1382 void init (int argc, const char *const *argv, const char *const *envv);
1383 void init2 (int argc, const char *const *argv);
1400 void init_vars (); 1384 void init_vars ();
1401 const char **init_resources (int argc, const char *const *argv); 1385 const char **init_resources (int argc, const char *const *argv);
1402 void init (int argc, const char *const *argv, stringvec *envv);
1403 void init_env (); 1386 void init_env ();
1404 void set_locale (const char *locale); 1387 void set_locale (const char *locale);
1405 void init_xlocale (); 1388 void init_xlocale ();
1406 void init_command (const char *const *argv); 1389 void init_command (const char *const *argv);
1407 void run_command (const char *const *argv); 1390 void run_command (const char *const *argv);
… …
1425 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1408 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1426 void set_utf8_property (Atom prop, const char *str, int len = -1); 1409 void set_utf8_property (Atom prop, const char *str, int len = -1);
1427 void set_title (const char *str); 1410 void set_title (const char *str);
1428 void set_icon_name (const char *str); 1411 void set_icon_name (const char *str);
1429 void set_window_color (int idx, const char *color); 1412 void set_window_color (int idx, const char *color);
1430 void set_colorfgbg (); 1413 char *get_colorfgbg ();
1431 bool set_color (rxvt_color &color, const char *name); 1414 bool set_color (rxvt_color &color, const char *name);
1432 void alias_color (int dst, int src); 1415 void alias_color (int dst, int src);
1433 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1416 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1434 void get_window_origin (int &x, int &y); 1417 void get_window_origin (int &x, int &y);
1435 Pixmap get_pixmap_property (Atom property); 1418 Pixmap get_pixmap_property (Atom property);
… …
1470#ifndef NO_BRIGHTCOLOR 1453#ifndef NO_BRIGHTCOLOR
1471 if (r & RS_Bold 1454 if (r & RS_Bold
1472# if ENABLE_STYLES 1455# if ENABLE_STYLES
1473 && option (Opt_intensityStyles) 1456 && option (Opt_intensityStyles)
1474# endif 1457# endif
1475 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1458 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1476 base += minBrightCOLOR - minCOLOR; 1459 base += minBrightCOLOR - minCOLOR;
1477#endif 1460#endif
1478 return base; 1461 return base;
1479 } 1462 }
1480 1463
… …
1484#ifndef NO_BRIGHTCOLOR 1467#ifndef NO_BRIGHTCOLOR
1485 if (r & RS_Blink 1468 if (r & RS_Blink
1486# if ENABLE_STYLES 1469# if ENABLE_STYLES
1487 && option (Opt_intensityStyles) 1470 && option (Opt_intensityStyles)
1488# endif 1471# endif
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1472 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR; 1473 base += minBrightCOLOR - minCOLOR;
1491#endif 1474#endif
1492 return base; 1475 return base;
1493 } 1476 }
1494 1477
… …
1496 { 1479 {
1497 return options[opt >> 3] & (1 << (opt & 7)); 1480 return options[opt >> 3] & (1 << (opt & 7));
1498 } 1481 }
1499 1482
1500 void set_option (uint8_t opt, bool set = true) NOTHROW; 1483 void set_option (uint8_t opt, bool set = true) NOTHROW;
1501
1502 void set_privmode (unsigned bit, int set) NOTHROW
1503 {
1504 if (set)
1505 priv_modes |= bit;
1506 else
1507 priv_modes &= ~bit;
1508 }
1509 1484
1510 // modifies first argument(!) 1485 // modifies first argument(!)
1511 void tt_paste (char *data, unsigned int len) NOTHROW; 1486 void tt_paste (char *data, unsigned int len) NOTHROW;
1512 void paste (char *data, unsigned int len) NOTHROW; 1487 void paste (char *data, unsigned int len) NOTHROW;
1513 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1488 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1584 void selection_click (int clicks, int x, int y) NOTHROW; 1559 void selection_click (int clicks, int x, int y) NOTHROW;
1585 void selection_extend (int x, int y, int flag) NOTHROW; 1560 void selection_extend (int x, int y, int flag) NOTHROW;
1586 void selection_rotate (int x, int y) NOTHROW; 1561 void selection_rotate (int x, int y) NOTHROW;
1587 1562
1588 // xdefaults.C 1563 // xdefaults.C
1589 void get_options (int argc, const char *const *argv); 1564 const char **get_options (int argc, const char *const *argv);
1590 int parse_keysym (const char *str, const char *arg); 1565 int parse_keysym (const char *str, const char *arg);
1591 const char *x_resource (const char *name); 1566 const char *x_resource (const char *name);
1592 void extract_resources (); 1567 void extract_resources ();
1568 void extract_keysym_resources ();
1593}; 1569};
1594 1570
1595#endif /* _RXVT_H_ */ 1571#endif /* _RXVT_H_ */
1596 1572

Diff Legend

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