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.510 by root, Fri Nov 30 07:02:12 2012 UTC vs.
Revision 1.542 by root, Wed Dec 17 15:35:42 2014 UTC

75 75
76#if HAVE_PIXBUF 76#if HAVE_PIXBUF
77# include <gdk-pixbuf/gdk-pixbuf.h> 77# include <gdk-pixbuf/gdk-pixbuf.h>
78#endif 78#endif
79 79
80#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
81# define HAVE_BG_PIXMAP 1 81# define HAVE_BG_PIXMAP 1
82# define HAVE_IMG 1
83#endif
84
85#if HAVE_BG_PIXMAP
86# if HAVE_PIXBUF
87# define BG_IMAGE_FROM_FILE 1
88# endif
89# if ENABLE_TRANSPARENCY
90# define BG_IMAGE_FROM_ROOT 1
91# endif
82#endif 92#endif
83 93
84#include <ecb.h> 94#include <ecb.h>
85#include "encoding.h" 95#include "encoding.h"
86#include "rxvtutil.h" 96#include "rxvtutil.h"
166 176
167void * rxvt_malloc (size_t size); 177void * rxvt_malloc (size_t size);
168void * rxvt_calloc (size_t number, size_t size); 178void * rxvt_calloc (size_t number, size_t size);
169void * rxvt_realloc (void *ptr, size_t size); 179void * rxvt_realloc (void *ptr, size_t size);
170 180
181KeySym rxvt_XKeycodeToKeysym (Display *dpy, KeyCode keycode, int index);
182
171///////////////////////////////////////////////////////////////////////////// 183/////////////////////////////////////////////////////////////////////////////
172 184
173// temporarily replace the process environment 185// temporarily replace the process environment
174extern char **environ; 186extern char **environ;
175extern char **rxvt_environ; // the original environ pointer 187extern char **rxvt_environ; // the original environ pointer
176
177static inline void
178set_environ (stringvec *envv)
179{
180#if ENABLE_PERL
181 assert (envv);
182#else
183 if (envv)
184#endif
185 environ = (char **)envv->begin ();
186}
187 188
188static inline void 189static inline void
189set_environ (char **envv) 190set_environ (char **envv)
190{ 191{
191#if ENABLE_PERL 192#if ENABLE_PERL
391 ERASE = +2, 392 ERASE = +2,
392}; 393};
393 394
394/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */ 395/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
395enum page_dirn { 396enum page_dirn {
396 UP, 397 DN = -1,
397 DN,
398 NO_DIR, 398 NO_DIR = 0,
399 UP = 1,
399}; 400};
400 401
401/* arguments for rxvt_term::scr_change_screen () */ 402/* arguments for rxvt_term::scr_change_screen () */
402enum { 403enum {
403 PRIMARY = 0, 404 PRIMARY = 0,
580#endif 581#endif
581 Color_scroll, 582 Color_scroll,
582#ifdef RXVT_SCROLLBAR 583#ifdef RXVT_SCROLLBAR
583 Color_trough, 584 Color_trough,
584#endif 585#endif
585#if ENABLE_TRANSPARENCY 586#if BG_IMAGE_FROM_ROOT
586 Color_tint, 587 Color_tint,
587#endif 588#endif
588#if OFF_FOCUS_FADING 589#if OFF_FOCUS_FADING
589 Color_fade, 590 Color_fade,
590#endif 591#endif
640#define PrivMode_MouseBtnEvent (1UL<<20) 641#define PrivMode_MouseBtnEvent (1UL<<20)
641#define PrivMode_MouseAnyEvent (1UL<<21) 642#define PrivMode_MouseAnyEvent (1UL<<21)
642#define PrivMode_BracketPaste (1UL<<22) 643#define PrivMode_BracketPaste (1UL<<22)
643#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack 644#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
644#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales 645#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
646#define PrivMode_BlinkingCursor (1UL<<25)
645 647
646#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 648#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
647 649
648#ifdef ALLOW_132_MODE 650#ifdef ALLOW_132_MODE
649# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 651# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
652#endif 654#endif
653 655
654// do not change these constants lightly, there are many interdependencies 656// do not change these constants lightly, there are many interdependencies
655#define IMBUFSIZ 128 // input modifier buffer sizes 657#define IMBUFSIZ 128 // input modifier buffer sizes
656#define KBUFSZ 512 // size of keyboard mapping buffer 658#define KBUFSZ 512 // size of keyboard mapping buffer
657#define CBUFSIZ 2048 // size of command buffer 659#define CBUFSIZ 32768 // size of command buffer (longest command sequence possible)
658#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 660#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
659#define UBUFSIZ 2048 // character buffer 661#define UBUFSIZ 2048 // character buffer
660 662
661#if ENABLE_FRILLS 663#if ENABLE_FRILLS
662# include <X11/Xmd.h> 664# include <X11/Xmd.h>
735 737
736#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 738#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
737#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 739#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
738 740
739#define GET_ATTR(x) (((x) & RS_attrMask)) 741#define GET_ATTR(x) (((x) & RS_attrMask))
740// return attributes defining the background, encoding doesn't matter
741// depends on RS_fgShift > RS_bgShift
742#define GET_BGATTR(x) \
743 (ecb_unlikely ((x) & RS_RVid) \
744 ? (((x) & (RS_attrMask & ~RS_RVid)) \
745 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
746 : ((x) & (RS_attrMask | RS_bgMask)))
747#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 742#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 743#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 744#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 745
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 746#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
860// that are not representable in unicode, as well as characters 855// that are not representable in unicode, as well as characters
861// not fitting in the BMP. 856// not fitting in the BMP.
862struct compose_char 857struct compose_char
863{ 858{
864 unicode_t c1, c2; // any chars != NOCHAR are valid 859 unicode_t c1, c2; // any chars != NOCHAR are valid
865 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4) 860
866 compose_char () = default;
867 #endif
868 compose_char (unicode_t c1, unicode_t c2) 861 compose_char (unicode_t c1, unicode_t c2)
869 : c1(c1), c2(c2) 862 : c1(c1), c2(c2)
870 { } 863 { }
871}; 864};
872 865
1134/* ---------- */ 1127/* ---------- */
1135 rend_t rstyle; 1128 rend_t rstyle;
1136/* ---------- */ 1129/* ---------- */
1137#ifdef SELECTION_SCROLLING 1130#ifdef SELECTION_SCROLLING
1138 int scroll_selection_lines; 1131 int scroll_selection_lines;
1139 enum page_dirn scroll_selection_dir;
1140 int selection_save_x, 1132 int selection_save_x,
1141 selection_save_y, 1133 selection_save_y,
1142 selection_save_state; 1134 selection_save_state;
1143#endif 1135#endif
1144/* ---------- */ 1136/* ---------- */
1153 mouse_row, 1145 mouse_row,
1154 mouse_col, 1146 mouse_col,
1155# ifdef POINTER_BLANK 1147# ifdef POINTER_BLANK
1156 pointerBlankDelay, 1148 pointerBlankDelay,
1157# endif 1149# endif
1150 multiClickTime,
1151 cursor_type,
1158 allowedxerror; 1152 allowedxerror;
1159/* ---------- */ 1153/* ---------- */
1160 unsigned int ModLevel3Mask, 1154 unsigned int ModLevel3Mask,
1161 ModMetaMask, 1155 ModMetaMask,
1162 ModNumLockMask; 1156 ModNumLockMask;
1172/* ---------- */ 1166/* ---------- */
1173 struct mouse_event MEvent; 1167 struct mouse_event MEvent;
1174 XComposeStatus compose; 1168 XComposeStatus compose;
1175 static struct termios def_tio; 1169 static struct termios def_tio;
1176 row_col_t oldcursor; 1170 row_col_t oldcursor;
1171
1177#ifdef HAVE_BG_PIXMAP 1172#ifdef HAVE_BG_PIXMAP
1178 void bg_init (); 1173 void bg_init ();
1179 void bg_destroy (); 1174 void bg_destroy ();
1180 1175
1176# if BG_IMAGE_FROM_FILE
1177 rxvt_image fimage;
1178 void render_image (rxvt_image &image);
1179# endif
1180
1181# if BG_IMAGE_FROM_ROOT
1182 rxvt_img *root_img;
1183 image_effects root_effects;
1184
1185 void render_root_image ();
1186# endif
1187
1188 ev_tstamp bg_valid_since;
1189
1190 bool bg_window_size_sensitive ();
1191 bool bg_window_position_sensitive ();
1192
1193 void bg_render ();
1194#endif
1195
1196#ifdef HAVE_IMG
1181 enum { 1197 enum {
1182 BG_IS_VALID = 1 << 0,
1183
1184 BG_IS_TRANSPARENT = 1 << 1, 1198 BG_IS_TRANSPARENT = 1 << 1,
1185 BG_NEEDS_REFRESH = 1 << 2, 1199 BG_NEEDS_REFRESH = 1 << 2,
1186 BG_INHIBIT_RENDER = 1 << 3, 1200 BG_INHIBIT_RENDER = 1 << 3,
1187 }; 1201 };
1188 1202
1189 uint8_t bg_flags; 1203 uint8_t bg_flags;
1190 1204
1191# if BG_IMAGE_FROM_FILE
1192 rxvt_image fimage;
1193 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1194 bool render_image (rxvt_image &image);
1195# endif
1196
1197# if ENABLE_TRANSPARENCY
1198 rxvt_img *root_img;
1199 image_effects root_effects;
1200
1201 void bg_set_transparent ()
1202 {
1203 bg_flags |= BG_IS_TRANSPARENT;
1204 }
1205 void bg_set_root_pixmap ();
1206 bool render_root_image ();
1207# endif
1208
1209 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1210
1211 ev_tstamp bg_valid_since;
1212
1213 rxvt_img *bg_img; 1205 rxvt_img *bg_img;
1214
1215 bool bg_window_size_sensitive ();
1216 bool bg_window_position_sensitive ();
1217
1218 void bg_render ();
1219 void bg_invalidate ()
1220 {
1221 bg_flags &= ~BG_IS_VALID;
1222 }
1223#endif 1206#endif
1224 1207
1225#if ENABLE_OVERLAY 1208#if ENABLE_OVERLAY
1226 overlay_base ov; 1209 overlay_base ov;
1227 1210
1242 char *locale; 1225 char *locale;
1243 char charsets[4]; 1226 char charsets[4];
1244 char *v_buffer; /* pointer to physical buffer */ 1227 char *v_buffer; /* pointer to physical buffer */
1245 unsigned int v_buflen; /* size of area to write */ 1228 unsigned int v_buflen; /* size of area to write */
1246 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1229 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1230 char **env;
1247 1231
1248#ifdef KEYSYM_RESOURCE 1232#ifdef KEYSYM_RESOURCE
1249 keyboard_manager *keyboard; 1233 keyboard_manager *keyboard;
1250#endif 1234#endif
1251#ifndef NO_RESOURCES 1235#ifndef NO_RESOURCES
1281 void vt_select_input () const NOTHROW 1265 void vt_select_input () const NOTHROW
1282 { 1266 {
1283 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1267 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1284 } 1268 }
1285 1269
1286#if ENABLE_TRANSPARENCY || ENABLE_PERL 1270#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1287 void rootwin_cb (XEvent &xev); 1271 void rootwin_cb (XEvent &xev);
1288 xevent_watcher rootwin_ev; 1272 xevent_watcher rootwin_ev;
1289#endif 1273#endif
1290#ifdef HAVE_BG_PIXMAP 1274#ifdef HAVE_BG_PIXMAP
1291 void update_background (); 1275 void update_background ();
1334 void pointer_blank (); 1318 void pointer_blank ();
1335#endif 1319#endif
1336 void pointer_unblank (); 1320 void pointer_unblank ();
1337 1321
1338 void tt_printf (const char *fmt,...); 1322 void tt_printf (const char *fmt,...);
1323 void tt_write_ (const char *data, unsigned int len);
1339 void tt_write (const char *data, unsigned int len); 1324 void tt_write (const char *data, unsigned int len);
1325 void tt_write_user_input (const char *data, unsigned int len);
1340 void pty_write (); 1326 void pty_write ();
1341 1327
1342 void make_current () const // make this the "currently active" urxvt instance 1328 void make_current () const // make this the "currently active" urxvt instance
1343 { 1329 {
1344 SET_R (this); 1330 SET_R (this);
1345 set_environ (envv); 1331 set_environ (env);
1346 rxvt_set_locale (locale); 1332 rxvt_set_locale (locale);
1347 } 1333 }
1348 1334
1349#if USE_XIM 1335#if USE_XIM
1350 rxvt_xim *input_method; 1336 rxvt_xim *input_method;
1383#if ENABLE_FRILLS 1369#if ENABLE_FRILLS
1384 void set_urgency (bool enable); 1370 void set_urgency (bool enable);
1385#else 1371#else
1386 void set_urgency (bool enable) { } 1372 void set_urgency (bool enable) { }
1387#endif 1373#endif
1388 void update_fade_color (unsigned int idx); 1374 void update_fade_color (unsigned int idx, bool first_time = false);
1389#ifdef PRINTPIPE 1375#ifdef PRINTPIPE
1390 FILE *popen_printer (); 1376 FILE *popen_printer ();
1391 int pclose_printer (FILE *stream); 1377 int pclose_printer (FILE *stream);
1392#endif 1378#endif
1393 void process_print_pipe (); 1379 void process_print_pipe ();
1402 void process_color_seq (int report, int color, const char *str, char resp); 1388 void process_color_seq (int report, int color, const char *str, char resp);
1403 void process_xterm_seq (int op, char *str, char resp); 1389 void process_xterm_seq (int op, char *str, char resp);
1404 int privcases (int mode, unsigned long bit); 1390 int privcases (int mode, unsigned long bit);
1405 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1391 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1406 void process_sgr_mode (unsigned int nargs, const int *arg); 1392 void process_sgr_mode (unsigned int nargs, const int *arg);
1393 void set_cursor_style (int style);
1407 // init.C 1394 // init.C
1408 void init (stringvec *argv, stringvec *envv); 1395 void init (stringvec *argv, stringvec *envv);
1409 void init (int argc, const char *const *argv, const char *const *envv); 1396 void init (int argc, const char *const *argv, const char *const *envv);
1410 void init2 (int argc, const char *const *argv); 1397 void init2 (int argc, const char *const *argv);
1411 void init_vars (); 1398 void init_vars ();
1416 void init_command (const char *const *argv); 1403 void init_command (const char *const *argv);
1417 void run_command (const char *const *argv); 1404 void run_command (const char *const *argv);
1418 int run_child (const char *const *argv); 1405 int run_child (const char *const *argv);
1419 void color_aliases (int idx); 1406 void color_aliases (int idx);
1420 void create_windows (int argc, const char *const *argv); 1407 void create_windows (int argc, const char *const *argv);
1421 void get_colours (); 1408 void get_colors ();
1422 void get_ourmods (); 1409 void get_ourmods ();
1423 void set_icon (const char *file); 1410 void set_icon (const char *file);
1424 // main.C 1411 // main.C
1425 void tt_winch (); 1412 void tt_winch ();
1426 rxvt_term (); 1413 rxvt_term ();
1427 ~rxvt_term (); 1414 ~rxvt_term ();
1428 void destroy (); 1415 void destroy ();
1429 void emergency_cleanup (); 1416 void emergency_cleanup ();
1430 void recolour_cursor (); 1417 void recolor_cursor ();
1431 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1418 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1432 void window_calc (unsigned int newwidth, unsigned int newheight); 1419 void window_calc (unsigned int newwidth, unsigned int newheight);
1433 bool set_fonts (); 1420 bool set_fonts ();
1434 void set_string_property (Atom prop, const char *str, int len = -1); 1421 void set_string_property (Atom prop, const char *str, int len = -1);
1435 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1422 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1485 void paste (char *data, unsigned int len) NOTHROW; 1472 void paste (char *data, unsigned int len) NOTHROW;
1486 void scr_alloc () NOTHROW; 1473 void scr_alloc () NOTHROW;
1487 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1474 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1488 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1475 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1489 void scr_kill_char (line_t &l, int col) const NOTHROW; 1476 void scr_kill_char (line_t &l, int col) const NOTHROW;
1477 void scr_set_char_rend (line_t &l, int col, rend_t rend);
1490 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1478 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1479 void copy_line (line_t &dst, line_t &src);
1491 void scr_reset (); 1480 void scr_reset ();
1492 void scr_release () NOTHROW; 1481 void scr_release () NOTHROW;
1493 void scr_clear (bool really = false) NOTHROW; 1482 void scr_clear (bool really = false) NOTHROW;
1494 void scr_refresh () NOTHROW; 1483 void scr_refresh () NOTHROW;
1495 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1484 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1499 void scr_backindex () NOTHROW; 1488 void scr_backindex () NOTHROW;
1500 void scr_forwardindex () NOTHROW; 1489 void scr_forwardindex () NOTHROW;
1501#endif 1490#endif
1502 void scr_touch (bool refresh) NOTHROW; 1491 void scr_touch (bool refresh) NOTHROW;
1503 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1492 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1504 void scr_recolour (bool refresh = true) NOTHROW; 1493 void scr_recolor (bool refresh = true) NOTHROW;
1505 void scr_remap_chars () NOTHROW; 1494 void scr_remap_chars () NOTHROW;
1506 void scr_remap_chars (line_t &l) NOTHROW; 1495 void scr_remap_chars (line_t &l) NOTHROW;
1507 1496
1508 enum cursor_mode { SAVE, RESTORE }; 1497 enum cursor_mode { SAVE, RESTORE };
1509 1498
1534 void scr_report_position () NOTHROW; 1523 void scr_report_position () NOTHROW;
1535 void set_font_style () NOTHROW; 1524 void set_font_style () NOTHROW;
1536 void scr_charset_choose (int set) NOTHROW; 1525 void scr_charset_choose (int set) NOTHROW;
1537 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1526 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1538 void scr_move_to (int y, int len) NOTHROW; 1527 void scr_move_to (int y, int len) NOTHROW;
1528 bool scr_page (int nlines) NOTHROW;
1539 bool scr_page (enum page_dirn direction, int nlines) NOTHROW; 1529 bool scr_page (enum page_dirn direction, int nlines) NOTHROW
1530 {
1531 return scr_page (direction * nlines);
1532 }
1540 bool scr_changeview (int new_view_start) NOTHROW; 1533 bool scr_changeview (int new_view_start) NOTHROW;
1541 void scr_bell () NOTHROW; 1534 void scr_bell () NOTHROW;
1542 void scr_printscreen (int fullhist) NOTHROW; 1535 void scr_printscreen (int fullhist) NOTHROW;
1543 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW; 1536 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1544 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1537 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1545 void scr_reverse_selection () NOTHROW; 1538 void scr_reverse_selection () NOTHROW;
1546 void scr_dump (int fd) NOTHROW; 1539 void scr_dump (int fd) NOTHROW;
1547 1540
1548 void selection_check (int check_more) NOTHROW; 1541 void selection_check (int check_more) NOTHROW;
1542 void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
1549 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1543 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1550 void selection_clear (bool clipboard = false) NOTHROW; 1544 void selection_clear (bool clipboard = false) NOTHROW;
1551 void selection_make (Time tm); 1545 void selection_make (Time tm);
1552 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1546 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1553 void selection_start_colrow (int col, int row) NOTHROW; 1547 void selection_start_colrow (int col, int row) NOTHROW;
1560 void selection_rotate (int x, int y) NOTHROW; 1554 void selection_rotate (int x, int y) NOTHROW;
1561 1555
1562 // xdefaults.C 1556 // xdefaults.C
1563 void rxvt_usage (int type); 1557 void rxvt_usage (int type);
1564 const char **get_options (int argc, const char *const *argv); 1558 const char **get_options (int argc, const char *const *argv);
1559 int parse_keysym (const char *str, unsigned int &state);
1565 int parse_keysym (const char *str, const char *arg); 1560 int bind_action (const char *str, const char *arg);
1566 const char *x_resource (const char *name); 1561 const char *x_resource (const char *name);
1567 void extract_resources (); 1562 void extract_resources ();
1563 void enumerate_keysym_resources (void (*cb)(rxvt_term *, const char *, const char *));
1568 void extract_keysym_resources (); 1564 void extract_keysym_resources ();
1569}; 1565};
1570 1566
1571#endif /* _RXVT_H_ */ 1567#endif /* _RXVT_H_ */
1572 1568

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines