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.444 by sf-exg, Fri Jul 8 20:54:31 2011 UTC vs.
Revision 1.481 by sf-exg, Sun May 20 16:23:42 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
31using namespace std;
32 28
33// we assume that Xlib.h defines XPointer, and it does since at least 1994... 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
34 30
35extern "C" { 31extern "C" {
36#include <X11/Xlib.h> 32#include <X11/Xlib.h>
… …
74#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
75#include <X11/keysym.h> 71#include <X11/keysym.h>
76#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
77#include <X11/Xatom.h> 73#include <X11/Xatom.h>
78 74
79#ifdef HAVE_AFTERIMAGE
80# include <afterimage.h>
81# undef min
82# undef max
83#endif
84
85#ifdef HAVE_PIXBUF 75#ifdef HAVE_PIXBUF
86# include <gdk-pixbuf/gdk-pixbuf.h> 76# include <gdk-pixbuf/gdk-pixbuf.h>
87#endif 77#endif
88 78
89#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
90# define HAVE_BG_PIXMAP 1 80# define HAVE_BG_PIXMAP 1
91#endif 81#endif
92 82
83#include <ecb.h>
93#include "encoding.h" 84#include "encoding.h"
94#include "rxvtutil.h" 85#include "rxvtutil.h"
95#include "rxvtfont.h" 86#include "rxvtfont.h"
96#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
97#include "scrollbar.h" 88#include "scrollbar.h"
… …
217 ~localise_env () 208 ~localise_env ()
218 { 209 {
219 environ = orig_env; 210 environ = orig_env;
220 } 211 }
221}; 212};
213
214#ifdef HAVE_BG_PIXMAP
215# ifdef BG_IMAGE_FROM_FILE
216enum {
217 IM_IS_SET = 1 << 0,
218 IM_IS_SIZE_SENSITIVE = 1 << 1,
219 IM_KEEP_ASPECT = 1 << 2,
220 IM_ROOT_ALIGN = 1 << 3,
221 IM_TILE = 1 << 4,
222 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
223};
224
225enum {
226 noScale = 0,
227 windowScale = 100,
228 defaultScale = windowScale,
229 centerAlign = 50,
230 defaultAlign = centerAlign,
231};
232
233struct rxvt_image
234{
235 uint8_t flags;
236 unsigned int h_scale, v_scale; /* percents of the window size */
237 int h_align, v_align; /* percents of the window size:
238 0 - left align, 50 - center, 100 - right */
239
240# ifdef HAVE_PIXBUF
241 GdkPixbuf *pixbuf;
242
243 ~rxvt_image ()
244 {
245 if (pixbuf)
246 g_object_unref (pixbuf);
247 }
248
249 int width ()
250 {
251 return gdk_pixbuf_get_width (pixbuf);
252 }
253 int height ()
254 {
255 return gdk_pixbuf_get_height (pixbuf);
256 }
257# endif
258
259 bool set_file (const char *file);
260 bool set_geometry (const char *geom, bool update = false);
261};
262# endif
263#endif
222 264
223/* 265/*
224 ***************************************************************************** 266 *****************************************************************************
225 * STRUCTURES AND TYPEDEFS 267 * STRUCTURES AND TYPEDEFS
226 ***************************************************************************** 268 *****************************************************************************
… …
779// that are not representable in unicode, as well as characters 821// that are not representable in unicode, as well as characters
780// not fitting in the BMP. 822// not fitting in the BMP.
781struct compose_char 823struct compose_char
782{ 824{
783 unicode_t c1, c2; // any chars != NOCHAR are valid 825 unicode_t c1, c2; // any chars != NOCHAR are valid
826 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
827 compose_char () = default;
828 #endif
784 compose_char (unicode_t c1, unicode_t c2) 829 compose_char (unicode_t c1, unicode_t c2)
785 : c1(c1), c2(c2) 830 : c1(c1), c2(c2)
786 { } 831 { }
787}; 832};
788 833
… …
870 * END······················= total_rows 915 * END······················= total_rows
871 */ 916 */
872 917
873struct TermWin_t 918struct TermWin_t
874{ 919{
920 int vt_width; /* actual window width [pixels] */
921 int vt_height; /* actual window height [pixels] */
875 int width; /* window width [pixels] */ 922 int width; /* window width [pixels] */
876 int height; /* window height [pixels] */ 923 int height; /* window height [pixels] */
877 int fwidth; /* font width [pixels] */ 924 int fwidth; /* font width [pixels] */
878 int fheight; /* font height [pixels] */ 925 int fheight; /* font height [pixels] */
879 int fbase; /* font ascent (baseline) [pixels] */ 926 int fbase; /* font ascent (baseline) [pixels] */
… …
891 int view_start; /* scrollback view starts here */ 938 int view_start; /* scrollback view starts here */
892 int top_row; /* topmost row index of scrollback */ 939 int top_row; /* topmost row index of scrollback */
893 Window parent; /* parent identifier */ 940 Window parent; /* parent identifier */
894 Window vt; /* vt100 window */ 941 Window vt; /* vt100 window */
895 GC gc; /* GC for drawing */ 942 GC gc; /* GC for drawing */
896 Pixmap pixmap;
897 rxvt_drawable *drawable; 943 rxvt_drawable *drawable;
898 rxvt_fontset *fontset[4]; 944 rxvt_fontset *fontset[4];
899}; 945};
900 946
901/* 947/*
… …
1028 hidden_pointer:1, 1074 hidden_pointer:1,
1029#endif 1075#endif
1030 enc_utf8:1, /* whether locale uses utf-8 */ 1076 enc_utf8:1, /* whether locale uses utf-8 */
1031 seen_input:1, /* whether we have seen some program output yet */ 1077 seen_input:1, /* whether we have seen some program output yet */
1032 seen_resize:1, /* whether we had a resize event */ 1078 seen_resize:1, /* whether we had a resize event */
1079 init_done:1,
1033 parsed_geometry:1; 1080 parsed_geometry:1;
1034 1081
1035 unsigned char refresh_type, 1082 unsigned char refresh_type,
1036#ifdef META8_OPTION 1083#ifdef META8_OPTION
1037 meta_char; /* Alt-key prefix */ 1084 meta_char; /* Alt-key prefix */
… …
1071 allowedxerror; 1118 allowedxerror;
1072/* ---------- */ 1119/* ---------- */
1073 unsigned int ModLevel3Mask, 1120 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1121 ModMetaMask,
1075 ModNumLockMask; 1122 ModNumLockMask;
1076 int old_width, /* last used width in screen resize */
1077 old_height; /* last used height in screen resize */
1078 unsigned long priv_modes, 1123 unsigned long priv_modes,
1079 SavedModes; 1124 SavedModes;
1080/* ---------- */ 1125/* ---------- */
1081 Atom *xa; 1126 Atom *xa;
1082/* ---------- */ 1127/* ---------- */
… …
1092#ifdef HAVE_BG_PIXMAP 1137#ifdef HAVE_BG_PIXMAP
1093 void bg_init (); 1138 void bg_init ();
1094 void bg_destroy (); 1139 void bg_destroy ();
1095 1140
1096 enum { 1141 enum {
1097 //subset returned by make_transparency_pixmap
1098 BG_IS_VALID = 1 << 0, 1142 BG_IS_VALID = 1 << 0,
1099 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2,
1101 1143
1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1103
1104 BG_PROP_SCALE = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN,
1107
1108 BG_TINT_SET = 1 << 5,
1109 BG_TINT_BITAND = 1 << 6,
1110 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1111
1112 BG_HAS_RENDER = 1 << 7,
1113 BG_HAS_RENDER_CONV = 1 << 8,
1114 BG_CLIENT_RENDER = 1 << 9,
1115
1116 BG_IS_TRANSPARENT = 1 << 10, 1144 BG_IS_TRANSPARENT = 1 << 1,
1117 BG_NEEDS_REFRESH = 1 << 11, 1145 BG_NEEDS_REFRESH = 1 << 2,
1118 BG_IS_SIZE_SENSITIVE = 1 << 12, 1146
1119 BG_IS_FROM_FILE = 1 << 13, 1147 BG_HAS_RENDER = 1 << 3,
1148 BG_HAS_RENDER_CONV = 1 << 4,
1149 BG_CLIENT_RENDER = 1 << 5,
1150
1151 BG_TINT_SET = 1 << 6,
1152 BG_TINT_BITAND = 1 << 7,
1120 }; 1153 };
1121 1154
1122 unsigned int bg_flags; 1155 uint8_t bg_flags;
1123 1156
1124# ifdef BG_IMAGE_FROM_FILE 1157# ifdef BG_IMAGE_FROM_FILE
1158 rxvt_image bg_image;
1125 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1159 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1126 bool render_image (unsigned long tr_flags); 1160 bool render_image (rxvt_image &image);
1127
1128 enum {
1129 noScale = 0,
1130 windowScale = 100,
1131 defaultScale = windowScale,
1132 centerAlign = 50,
1133 defaultAlign = centerAlign,
1134 };
1135
1136 unsigned int h_scale, v_scale; /* percents of the window size */
1137 int h_align, v_align; /* percents of the window size:
1138 0 - left align, 50 - center, 100 - right */
1139
1140 bool bg_set_geometry (const char *geom, bool update = false);
1141 void bg_set_default_geometry ()
1142 {
1143 h_scale = v_scale = defaultScale;
1144 h_align = v_align = defaultAlign;
1145 }
1146
1147 bool bg_set_file (const char *file);
1148# endif 1161# endif
1149 1162
1150# ifdef ENABLE_TRANSPARENCY 1163# ifdef ENABLE_TRANSPARENCY
1151 Pixmap root_pixmap; /* current root pixmap set */ 1164 Pixmap root_pixmap; /* current root pixmap set */
1152 rxvt_color tint; 1165 rxvt_color tint;
1153 int shade; 1166 int shade;
1154 int h_blurRadius, v_blurRadius; 1167 int h_blurRadius, v_blurRadius;
1155 1168
1156 bool bg_set_transparent (); 1169 void bg_set_transparent ()
1170 {
1171 bg_flags |= BG_IS_TRANSPARENT;
1172 }
1157 void bg_set_root_pixmap (); 1173 void bg_set_root_pixmap ();
1158 void set_tint_shade_flags ();
1159 bool bg_set_tint (rxvt_color &new_tint); 1174 bool bg_set_tint (rxvt_color &new_tint);
1160 bool bg_set_shade (const char *shade_str); 1175 bool bg_set_shade (const char *shade_str);
1161 bool bg_set_blur (const char *geom); 1176 bool bg_set_blur (const char *geom);
1162 1177
1163 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1178 bool blur_pixmap (Pixmap pixmap, int width, int height);
1164 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1179 bool tint_pixmap (Pixmap pixmap, int width, int height);
1180 void tint_ximage (XImage *ximage);
1165 unsigned long make_transparency_pixmap (); 1181 bool make_transparency_pixmap ();
1166# endif 1182# endif
1167 1183
1168 ev_tstamp bg_valid_since; 1184 ev_tstamp bg_valid_since;
1169 1185
1170 Pixmap bg_pixmap; 1186 Pixmap bg_pixmap;
… …
1180 void bg_invalidate () 1196 void bg_invalidate ()
1181 { 1197 {
1182 bg_flags &= ~BG_IS_VALID; 1198 bg_flags &= ~BG_IS_VALID;
1183 } 1199 }
1184#endif 1200#endif
1185#ifdef HAVE_AFTERIMAGE
1186 ASImage *original_asim;
1187 ASVisual *asv;
1188 ASImageManager *asimman;
1189
1190 void init_asv ()
1191 {
1192 if (!asv)
1193 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1194 }
1195#endif
1196#ifdef HAVE_PIXBUF 1201#ifdef HAVE_PIXBUF
1197 GdkPixbuf *pixbuf;
1198 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1202 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1199 int src_x, int src_y, int dst_x, int dst_y, 1203 int src_x, int src_y, int dst_x, int dst_y,
1200 unsigned int width, unsigned int height); 1204 unsigned int width, unsigned int height);
1201#endif 1205#endif
1202 1206
… …
1212 void scr_overlay_set (int x, int y, const char *s) NOTHROW; 1216 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1213 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1217 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1214#endif 1218#endif
1215 1219
1216 vector<void *> allocated; // free these memory blocks with free() 1220 vector<void *> allocated; // free these memory blocks with free()
1217
1218 char env_windowid[21]; /* environmental variable WINDOWID */
1219 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1220 char *env_display; /* environmental variable DISPLAY */
1221 char *env_term; /* environmental variable TERM */
1222 1221
1223 char *locale; 1222 char *locale;
1224 char charsets[4]; 1223 char charsets[4];
1225 char *v_buffer; /* pointer to physical buffer */ 1224 char *v_buffer; /* pointer to physical buffer */
1226 unsigned int v_buflen; /* size of area to write */ 1225 unsigned int v_buflen; /* size of area to write */
… …
1286 void cmdbuf_append (const char *str, size_t count); 1285 void cmdbuf_append (const char *str, size_t count);
1287 bool pty_fill (); 1286 bool pty_fill ();
1288 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1287 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1289 1288
1290#ifdef CURSOR_BLINK 1289#ifdef CURSOR_BLINK
1290 void cursor_blink_reset ();
1291 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1291 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1292#endif 1292#endif
1293#ifdef TEXT_BLINK 1293#ifdef TEXT_BLINK
1294 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1294 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1295#endif 1295#endif
… …
1314 void pointer_unblank (); 1314 void pointer_unblank ();
1315 1315
1316 void tt_printf (const char *fmt,...); 1316 void tt_printf (const char *fmt,...);
1317 void tt_write (const char *data, unsigned int len); 1317 void tt_write (const char *data, unsigned int len);
1318 void pty_write (); 1318 void pty_write ();
1319
1320 void init (stringvec *argv, stringvec *envv)
1321 {
1322 this->argv = argv;
1323 init (argv->size (), argv->begin (), envv);
1324 }
1325 1319
1326 void make_current () const // make this the "currently active" urxvt instance 1320 void make_current () const // make this the "currently active" urxvt instance
1327 { 1321 {
1328 SET_R (this); 1322 SET_R (this);
1329 set_environ (envv); 1323 set_environ (envv);
… …
1341 void im_set_size (XRectangle &size); 1335 void im_set_size (XRectangle &size);
1342 void im_set_position (XPoint &pos) NOTHROW; 1336 void im_set_position (XPoint &pos) NOTHROW;
1343 void im_set_color (unsigned long &fg, unsigned long &bg); 1337 void im_set_color (unsigned long &fg, unsigned long &bg);
1344 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1338 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1345 1339
1346 bool IMisRunning (); 1340 bool im_is_running ();
1347 void IMSendSpot (); 1341 void im_send_spot ();
1348 bool IM_get_IC (const char *modifiers); 1342 bool im_get_ic (const char *modifiers);
1349 void IMSetPosition (); 1343 void im_set_position ();
1350#endif 1344#endif
1351 1345
1352 // command.C 1346 // command.C
1353 void key_press (XKeyEvent &ev); 1347 void key_press (XKeyEvent &ev);
1354 void key_release (XKeyEvent &ev); 1348 void key_release (XKeyEvent &ev);
… …
1387 void process_xterm_seq (int op, char *str, char resp); 1381 void process_xterm_seq (int op, char *str, char resp);
1388 int privcases (int mode, unsigned long bit); 1382 int privcases (int mode, unsigned long bit);
1389 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1383 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1390 void process_sgr_mode (unsigned int nargs, const int *arg); 1384 void process_sgr_mode (unsigned int nargs, const int *arg);
1391 // init.C 1385 // init.C
1386 void init (stringvec *argv, stringvec *envv);
1387 void init (int argc, const char *const *argv, const char *const *envv);
1388 void init2 (int argc, const char *const *argv);
1392 void init_vars (); 1389 void init_vars ();
1393 const char **init_resources (int argc, const char *const *argv); 1390 const char **init_resources (int argc, const char *const *argv);
1394 void init (int argc, const char *const *argv, stringvec *envv);
1395 void init_env (); 1391 void init_env ();
1396 void set_locale (const char *locale); 1392 void set_locale (const char *locale);
1397 void init_xlocale (); 1393 void init_xlocale ();
1398 void init_command (const char *const *argv); 1394 void init_command (const char *const *argv);
1399 void run_command (const char *const *argv); 1395 void run_command (const char *const *argv);
… …
1417 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1413 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1418 void set_utf8_property (Atom prop, const char *str, int len = -1); 1414 void set_utf8_property (Atom prop, const char *str, int len = -1);
1419 void set_title (const char *str); 1415 void set_title (const char *str);
1420 void set_icon_name (const char *str); 1416 void set_icon_name (const char *str);
1421 void set_window_color (int idx, const char *color); 1417 void set_window_color (int idx, const char *color);
1422 void set_colorfgbg (); 1418 char *get_colorfgbg ();
1423 bool set_color (rxvt_color &color, const char *name); 1419 bool set_color (rxvt_color &color, const char *name);
1424 void alias_color (int dst, int src); 1420 void alias_color (int dst, int src);
1425 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1421 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1426 void get_window_origin (int &x, int &y); 1422 void get_window_origin (int &x, int &y);
1427 Pixmap get_pixmap_property (Atom property); 1423 Pixmap get_pixmap_property (Atom property);
… …
1462#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
1463 if (r & RS_Bold 1459 if (r & RS_Bold
1464# if ENABLE_STYLES 1460# if ENABLE_STYLES
1465 && option (Opt_intensityStyles) 1461 && option (Opt_intensityStyles)
1466# endif 1462# endif
1467 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1463 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1468 base += minBrightCOLOR - minCOLOR; 1464 base += minBrightCOLOR - minCOLOR;
1469#endif 1465#endif
1470 return base; 1466 return base;
1471 } 1467 }
1472 1468
… …
1476#ifndef NO_BRIGHTCOLOR 1472#ifndef NO_BRIGHTCOLOR
1477 if (r & RS_Blink 1473 if (r & RS_Blink
1478# if ENABLE_STYLES 1474# if ENABLE_STYLES
1479 && option (Opt_intensityStyles) 1475 && option (Opt_intensityStyles)
1480# endif 1476# endif
1481 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1477 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1482 base += minBrightCOLOR - minCOLOR; 1478 base += minBrightCOLOR - minCOLOR;
1483#endif 1479#endif
1484 return base; 1480 return base;
1485 } 1481 }
1486 1482
… …
1488 { 1484 {
1489 return options[opt >> 3] & (1 << (opt & 7)); 1485 return options[opt >> 3] & (1 << (opt & 7));
1490 } 1486 }
1491 1487
1492 void set_option (uint8_t opt, bool set = true) NOTHROW; 1488 void set_option (uint8_t opt, bool set = true) NOTHROW;
1493
1494 void set_privmode (unsigned bit, int set) NOTHROW
1495 {
1496 if (set)
1497 priv_modes |= bit;
1498 else
1499 priv_modes &= ~bit;
1500 }
1501 1489
1502 // modifies first argument(!) 1490 // modifies first argument(!)
1503 void tt_paste (char *data, unsigned int len) NOTHROW; 1491 void tt_paste (char *data, unsigned int len) NOTHROW;
1504 void paste (char *data, unsigned int len) NOTHROW; 1492 void paste (char *data, unsigned int len) NOTHROW;
1505 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1493 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1576 void selection_click (int clicks, int x, int y) NOTHROW; 1564 void selection_click (int clicks, int x, int y) NOTHROW;
1577 void selection_extend (int x, int y, int flag) NOTHROW; 1565 void selection_extend (int x, int y, int flag) NOTHROW;
1578 void selection_rotate (int x, int y) NOTHROW; 1566 void selection_rotate (int x, int y) NOTHROW;
1579 1567
1580 // xdefaults.C 1568 // xdefaults.C
1581 void get_options (int argc, const char *const *argv); 1569 const char **get_options (int argc, const char *const *argv);
1582 int parse_keysym (const char *str, const char *arg); 1570 int parse_keysym (const char *str, const char *arg);
1583 const char *x_resource (const char *name); 1571 const char *x_resource (const char *name);
1584 void extract_resources (); 1572 void extract_resources ();
1573 void extract_keysym_resources ();
1585}; 1574};
1586 1575
1587#endif /* _RXVT_H_ */ 1576#endif /* _RXVT_H_ */
1588 1577

Diff Legend

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