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.446 by sf-exg, Tue Aug 9 18:41:31 2011 UTC vs.
Revision 1.479 by root, Sat May 19 02:23:07 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# endif
243
244 ~rxvt_image ()
245 {
246# ifdef HAVE_PIXBUF
247 if (pixbuf)
248 g_object_unref (pixbuf);
249# endif
250 }
251
252 int width ()
253 {
254# ifdef HAVE_PIXBUF
255 return gdk_pixbuf_get_width (pixbuf);
256# endif
257 }
258 int height ()
259 {
260# ifdef HAVE_PIXBUF
261 return gdk_pixbuf_get_height (pixbuf);
262# endif
263 }
264 bool set_file (const char *file);
265 bool set_geometry (const char *geom, bool update = false);
266 void set_default_geometry ()
267 {
268 h_scale = v_scale = defaultScale;
269 h_align = v_align = defaultAlign;
270 flags |= IM_IS_SIZE_SENSITIVE;
271 }
272};
273# endif
274#endif
222 275
223/* 276/*
224 ***************************************************************************** 277 *****************************************************************************
225 * STRUCTURES AND TYPEDEFS 278 * STRUCTURES AND TYPEDEFS
226 ***************************************************************************** 279 *****************************************************************************
… …
779// that are not representable in unicode, as well as characters 832// that are not representable in unicode, as well as characters
780// not fitting in the BMP. 833// not fitting in the BMP.
781struct compose_char 834struct compose_char
782{ 835{
783 unicode_t c1, c2; // any chars != NOCHAR are valid 836 unicode_t c1, c2; // any chars != NOCHAR are valid
837 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
838 compose_char () = default;
839 #endif
784 compose_char (unicode_t c1, unicode_t c2) 840 compose_char (unicode_t c1, unicode_t c2)
785 : c1(c1), c2(c2) 841 : c1(c1), c2(c2)
786 { } 842 { }
787}; 843};
788 844
… …
870 * END······················= total_rows 926 * END······················= total_rows
871 */ 927 */
872 928
873struct TermWin_t 929struct TermWin_t
874{ 930{
931 int vt_width; /* actual window width [pixels] */
932 int vt_height; /* actual window height [pixels] */
875 int width; /* window width [pixels] */ 933 int width; /* window width [pixels] */
876 int height; /* window height [pixels] */ 934 int height; /* window height [pixels] */
877 int fwidth; /* font width [pixels] */ 935 int fwidth; /* font width [pixels] */
878 int fheight; /* font height [pixels] */ 936 int fheight; /* font height [pixels] */
879 int fbase; /* font ascent (baseline) [pixels] */ 937 int fbase; /* font ascent (baseline) [pixels] */
… …
891 int view_start; /* scrollback view starts here */ 949 int view_start; /* scrollback view starts here */
892 int top_row; /* topmost row index of scrollback */ 950 int top_row; /* topmost row index of scrollback */
893 Window parent; /* parent identifier */ 951 Window parent; /* parent identifier */
894 Window vt; /* vt100 window */ 952 Window vt; /* vt100 window */
895 GC gc; /* GC for drawing */ 953 GC gc; /* GC for drawing */
896 Pixmap pixmap;
897 rxvt_drawable *drawable; 954 rxvt_drawable *drawable;
898 rxvt_fontset *fontset[4]; 955 rxvt_fontset *fontset[4];
899}; 956};
900 957
901/* 958/*
… …
1028 hidden_pointer:1, 1085 hidden_pointer:1,
1029#endif 1086#endif
1030 enc_utf8:1, /* whether locale uses utf-8 */ 1087 enc_utf8:1, /* whether locale uses utf-8 */
1031 seen_input:1, /* whether we have seen some program output yet */ 1088 seen_input:1, /* whether we have seen some program output yet */
1032 seen_resize:1, /* whether we had a resize event */ 1089 seen_resize:1, /* whether we had a resize event */
1090 init_done:1,
1033 parsed_geometry:1; 1091 parsed_geometry:1;
1034 1092
1035 unsigned char refresh_type, 1093 unsigned char refresh_type,
1036#ifdef META8_OPTION 1094#ifdef META8_OPTION
1037 meta_char; /* Alt-key prefix */ 1095 meta_char; /* Alt-key prefix */
… …
1071 allowedxerror; 1129 allowedxerror;
1072/* ---------- */ 1130/* ---------- */
1073 unsigned int ModLevel3Mask, 1131 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1132 ModMetaMask,
1075 ModNumLockMask; 1133 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, 1134 unsigned long priv_modes,
1079 SavedModes; 1135 SavedModes;
1080/* ---------- */ 1136/* ---------- */
1081 Atom *xa; 1137 Atom *xa;
1082/* ---------- */ 1138/* ---------- */
… …
1092#ifdef HAVE_BG_PIXMAP 1148#ifdef HAVE_BG_PIXMAP
1093 void bg_init (); 1149 void bg_init ();
1094 void bg_destroy (); 1150 void bg_destroy ();
1095 1151
1096 enum { 1152 enum {
1097 //subset returned by make_transparency_pixmap
1098 BG_IS_VALID = 1 << 0, 1153 BG_IS_VALID = 1 << 0,
1099 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2,
1101 1154
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_TILE = 1 << 14,
1107 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN | BG_TILE,
1108
1109 BG_TINT_SET = 1 << 5,
1110 BG_TINT_BITAND = 1 << 6,
1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1112
1113 BG_HAS_RENDER = 1 << 7,
1114 BG_HAS_RENDER_CONV = 1 << 8,
1115 BG_CLIENT_RENDER = 1 << 9,
1116
1117 BG_IS_TRANSPARENT = 1 << 10, 1155 BG_IS_TRANSPARENT = 1 << 1,
1118 BG_NEEDS_REFRESH = 1 << 11, 1156 BG_NEEDS_REFRESH = 1 << 2,
1119 BG_IS_SIZE_SENSITIVE = 1 << 12, 1157
1120 BG_IS_FROM_FILE = 1 << 13, 1158 BG_HAS_RENDER = 1 << 3,
1159 BG_HAS_RENDER_CONV = 1 << 4,
1160 BG_CLIENT_RENDER = 1 << 5,
1161
1162 BG_TINT_SET = 1 << 6,
1163 BG_TINT_BITAND = 1 << 7,
1121 }; 1164 };
1122 1165
1123 unsigned int bg_flags; 1166 uint8_t bg_flags;
1124 1167
1125# ifdef BG_IMAGE_FROM_FILE 1168# ifdef BG_IMAGE_FROM_FILE
1169 rxvt_image bg_image;
1126 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1170 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1127 bool render_image (unsigned long tr_flags); 1171 bool render_image (rxvt_image &image);
1128
1129 enum {
1130 noScale = 0,
1131 windowScale = 100,
1132 defaultScale = windowScale,
1133 centerAlign = 50,
1134 defaultAlign = centerAlign,
1135 };
1136
1137 unsigned int h_scale, v_scale; /* percents of the window size */
1138 int h_align, v_align; /* percents of the window size:
1139 0 - left align, 50 - center, 100 - right */
1140
1141 bool bg_set_geometry (const char *geom, bool update = false);
1142 void bg_set_default_geometry ()
1143 {
1144 h_scale = v_scale = defaultScale;
1145 h_align = v_align = defaultAlign;
1146 }
1147
1148 bool bg_set_file (const char *file);
1149# endif 1172# endif
1150 1173
1151# ifdef ENABLE_TRANSPARENCY 1174# ifdef ENABLE_TRANSPARENCY
1152 Pixmap root_pixmap; /* current root pixmap set */ 1175 Pixmap root_pixmap; /* current root pixmap set */
1153 rxvt_color tint; 1176 rxvt_color tint;
1154 int shade; 1177 int shade;
1155 int h_blurRadius, v_blurRadius; 1178 int h_blurRadius, v_blurRadius;
1156 1179
1157 bool bg_set_transparent (); 1180 void bg_set_transparent ()
1181 {
1182 bg_flags |= BG_IS_TRANSPARENT;
1183 }
1158 void bg_set_root_pixmap (); 1184 void bg_set_root_pixmap ();
1159 void set_tint_shade_flags ();
1160 bool bg_set_tint (rxvt_color &new_tint); 1185 bool bg_set_tint (rxvt_color &new_tint);
1161 bool bg_set_shade (const char *shade_str); 1186 bool bg_set_shade (const char *shade_str);
1162 bool bg_set_blur (const char *geom); 1187 bool bg_set_blur (const char *geom);
1163 1188
1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1189 bool blur_pixmap (Pixmap pixmap, int width, int height);
1165 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1190 bool tint_pixmap (Pixmap pixmap, int width, int height);
1191 void tint_ximage (XImage *ximage);
1166 unsigned long make_transparency_pixmap (); 1192 bool make_transparency_pixmap ();
1167# endif 1193# endif
1168 1194
1169 ev_tstamp bg_valid_since; 1195 ev_tstamp bg_valid_since;
1170 1196
1171 Pixmap bg_pixmap; 1197 Pixmap bg_pixmap;
… …
1181 void bg_invalidate () 1207 void bg_invalidate ()
1182 { 1208 {
1183 bg_flags &= ~BG_IS_VALID; 1209 bg_flags &= ~BG_IS_VALID;
1184 } 1210 }
1185#endif 1211#endif
1186#ifdef HAVE_AFTERIMAGE
1187 ASImage *original_asim;
1188 ASVisual *asv;
1189 ASImageManager *asimman;
1190
1191 void init_asv ()
1192 {
1193 if (!asv)
1194 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1195 }
1196#endif
1197#ifdef HAVE_PIXBUF 1212#ifdef HAVE_PIXBUF
1198 GdkPixbuf *pixbuf;
1199 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1213 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1200 int src_x, int src_y, int dst_x, int dst_y, 1214 int src_x, int src_y, int dst_x, int dst_y,
1201 unsigned int width, unsigned int height); 1215 unsigned int width, unsigned int height);
1202#endif 1216#endif
1203 1217
… …
1213 void scr_overlay_set (int x, int y, const char *s) NOTHROW; 1227 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1214 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1228 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1215#endif 1229#endif
1216 1230
1217 vector<void *> allocated; // free these memory blocks with free() 1231 vector<void *> allocated; // free these memory blocks with free()
1218
1219 char env_windowid[21]; /* environmental variable WINDOWID */
1220 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1221 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */
1223 1232
1224 char *locale; 1233 char *locale;
1225 char charsets[4]; 1234 char charsets[4];
1226 char *v_buffer; /* pointer to physical buffer */ 1235 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1236 unsigned int v_buflen; /* size of area to write */
… …
1287 void cmdbuf_append (const char *str, size_t count); 1296 void cmdbuf_append (const char *str, size_t count);
1288 bool pty_fill (); 1297 bool pty_fill ();
1289 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1298 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1290 1299
1291#ifdef CURSOR_BLINK 1300#ifdef CURSOR_BLINK
1301 void cursor_blink_reset ();
1292 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1302 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1293#endif 1303#endif
1294#ifdef TEXT_BLINK 1304#ifdef TEXT_BLINK
1295 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1305 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1296#endif 1306#endif
… …
1315 void pointer_unblank (); 1325 void pointer_unblank ();
1316 1326
1317 void tt_printf (const char *fmt,...); 1327 void tt_printf (const char *fmt,...);
1318 void tt_write (const char *data, unsigned int len); 1328 void tt_write (const char *data, unsigned int len);
1319 void pty_write (); 1329 void pty_write ();
1320
1321 void init (stringvec *argv, stringvec *envv)
1322 {
1323 this->argv = argv;
1324 init (argv->size (), argv->begin (), envv);
1325 }
1326 1330
1327 void make_current () const // make this the "currently active" urxvt instance 1331 void make_current () const // make this the "currently active" urxvt instance
1328 { 1332 {
1329 SET_R (this); 1333 SET_R (this);
1330 set_environ (envv); 1334 set_environ (envv);
… …
1388 void process_xterm_seq (int op, char *str, char resp); 1392 void process_xterm_seq (int op, char *str, char resp);
1389 int privcases (int mode, unsigned long bit); 1393 int privcases (int mode, unsigned long bit);
1390 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1394 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1391 void process_sgr_mode (unsigned int nargs, const int *arg); 1395 void process_sgr_mode (unsigned int nargs, const int *arg);
1392 // init.C 1396 // init.C
1397 void init (stringvec *argv, stringvec *envv);
1398 void init (int argc, const char *const *argv, const char *const *envv);
1399 void init2 (int argc, const char *const *argv);
1393 void init_vars (); 1400 void init_vars ();
1394 const char **init_resources (int argc, const char *const *argv); 1401 const char **init_resources (int argc, const char *const *argv);
1395 void init (int argc, const char *const *argv, stringvec *envv);
1396 void init_env (); 1402 void init_env ();
1397 void set_locale (const char *locale); 1403 void set_locale (const char *locale);
1398 void init_xlocale (); 1404 void init_xlocale ();
1399 void init_command (const char *const *argv); 1405 void init_command (const char *const *argv);
1400 void run_command (const char *const *argv); 1406 void run_command (const char *const *argv);
… …
1418 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1424 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1419 void set_utf8_property (Atom prop, const char *str, int len = -1); 1425 void set_utf8_property (Atom prop, const char *str, int len = -1);
1420 void set_title (const char *str); 1426 void set_title (const char *str);
1421 void set_icon_name (const char *str); 1427 void set_icon_name (const char *str);
1422 void set_window_color (int idx, const char *color); 1428 void set_window_color (int idx, const char *color);
1423 void set_colorfgbg (); 1429 char *get_colorfgbg ();
1424 bool set_color (rxvt_color &color, const char *name); 1430 bool set_color (rxvt_color &color, const char *name);
1425 void alias_color (int dst, int src); 1431 void alias_color (int dst, int src);
1426 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1432 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1427 void get_window_origin (int &x, int &y); 1433 void get_window_origin (int &x, int &y);
1428 Pixmap get_pixmap_property (Atom property); 1434 Pixmap get_pixmap_property (Atom property);
… …
1463#ifndef NO_BRIGHTCOLOR 1469#ifndef NO_BRIGHTCOLOR
1464 if (r & RS_Bold 1470 if (r & RS_Bold
1465# if ENABLE_STYLES 1471# if ENABLE_STYLES
1466 && option (Opt_intensityStyles) 1472 && option (Opt_intensityStyles)
1467# endif 1473# endif
1468 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1474 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1469 base += minBrightCOLOR - minCOLOR; 1475 base += minBrightCOLOR - minCOLOR;
1470#endif 1476#endif
1471 return base; 1477 return base;
1472 } 1478 }
1473 1479
… …
1477#ifndef NO_BRIGHTCOLOR 1483#ifndef NO_BRIGHTCOLOR
1478 if (r & RS_Blink 1484 if (r & RS_Blink
1479# if ENABLE_STYLES 1485# if ENABLE_STYLES
1480 && option (Opt_intensityStyles) 1486 && option (Opt_intensityStyles)
1481# endif 1487# endif
1482 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1488 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1483 base += minBrightCOLOR - minCOLOR; 1489 base += minBrightCOLOR - minCOLOR;
1484#endif 1490#endif
1485 return base; 1491 return base;
1486 } 1492 }
1487 1493
… …
1489 { 1495 {
1490 return options[opt >> 3] & (1 << (opt & 7)); 1496 return options[opt >> 3] & (1 << (opt & 7));
1491 } 1497 }
1492 1498
1493 void set_option (uint8_t opt, bool set = true) NOTHROW; 1499 void set_option (uint8_t opt, bool set = true) NOTHROW;
1494
1495 void set_privmode (unsigned bit, int set) NOTHROW
1496 {
1497 if (set)
1498 priv_modes |= bit;
1499 else
1500 priv_modes &= ~bit;
1501 }
1502 1500
1503 // modifies first argument(!) 1501 // modifies first argument(!)
1504 void tt_paste (char *data, unsigned int len) NOTHROW; 1502 void tt_paste (char *data, unsigned int len) NOTHROW;
1505 void paste (char *data, unsigned int len) NOTHROW; 1503 void paste (char *data, unsigned int len) NOTHROW;
1506 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1504 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1577 void selection_click (int clicks, int x, int y) NOTHROW; 1575 void selection_click (int clicks, int x, int y) NOTHROW;
1578 void selection_extend (int x, int y, int flag) NOTHROW; 1576 void selection_extend (int x, int y, int flag) NOTHROW;
1579 void selection_rotate (int x, int y) NOTHROW; 1577 void selection_rotate (int x, int y) NOTHROW;
1580 1578
1581 // xdefaults.C 1579 // xdefaults.C
1582 void get_options (int argc, const char *const *argv); 1580 const char **get_options (int argc, const char *const *argv);
1583 int parse_keysym (const char *str, const char *arg); 1581 int parse_keysym (const char *str, const char *arg);
1584 const char *x_resource (const char *name); 1582 const char *x_resource (const char *name);
1585 void extract_resources (); 1583 void extract_resources ();
1584 void extract_keysym_resources ();
1586}; 1585};
1587 1586
1588#endif /* _RXVT_H_ */ 1587#endif /* _RXVT_H_ */
1589 1588

Diff Legend

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