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.478 by root, Thu May 17 22:00:57 2012 UTC vs.
Revision 1.518 by sf-exg, Sun Jan 13 22:30:47 2013 UTC

45 45
46#include "feature.h" 46#include "feature.h"
47 47
48#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
49# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
50#endif 51#endif
51 52
52#if ENABLE_PERL 53#if ENABLE_PERL
53# define ENABLE_FRILLS 1 54# define ENABLE_FRILLS 1
54# define ENABLE_COMBINING 1 55# define ENABLE_COMBINING 1
70#include <X11/cursorfont.h> 71#include <X11/cursorfont.h>
71#include <X11/keysym.h> 72#include <X11/keysym.h>
72#include <X11/keysymdef.h> 73#include <X11/keysymdef.h>
73#include <X11/Xatom.h> 74#include <X11/Xatom.h>
74 75
75#ifdef HAVE_PIXBUF 76#if HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h> 77# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif 78#endif
78 79
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1 81# define HAVE_BG_PIXMAP 1
81#endif 82#endif
82 83
84#if HAVE_BG_PIXMAP
85# if HAVE_PIXBUF
86# define BG_IMAGE_FROM_FILE 1
87# endif
88# if ENABLE_TRANSPARENCY
89# define BG_IMAGE_FROM_ROOT 1
90# endif
91#endif
92
93#include <ecb.h>
83#include "encoding.h" 94#include "encoding.h"
84#include "rxvtutil.h" 95#include "rxvtutil.h"
85#include "rxvtfont.h" 96#include "rxvtfont.h"
86#include "rxvttoolkit.h" 97#include "rxvttoolkit.h"
98#include "rxvtimg.h"
87#include "scrollbar.h" 99#include "scrollbar.h"
88#include "ev_cpp.h" 100#include "ev_cpp.h"
89#include "salloc.h"
90#include "libptytty.h" 101#include "libptytty.h"
91 102
92#include "rxvtperl.h" 103#include "rxvtperl.h"
93 104
94// try to avoid some macros to decrease code size, on some systems 105// try to avoid some macros to decrease code size, on some systems
147 158
148const char * rxvt_basename (const char *str) NOTHROW; 159const char * rxvt_basename (const char *str) NOTHROW;
149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 160void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
150void rxvt_log (const char *fmt,...) NOTHROW; 161void rxvt_log (const char *fmt,...) NOTHROW;
151void rxvt_warn (const char *fmt,...) NOTHROW; 162void rxvt_warn (const char *fmt,...) NOTHROW;
152void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn; 163void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; 164void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
154 165
155char * rxvt_strtrim (char *str) NOTHROW; 166char * rxvt_strtrim (char *str) NOTHROW;
156char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 167char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
157 168
158static inline void 169static inline void
209 environ = orig_env; 220 environ = orig_env;
210 } 221 }
211}; 222};
212 223
213#ifdef HAVE_BG_PIXMAP 224#ifdef HAVE_BG_PIXMAP
225struct image_effects
226{
227 bool tint_set;
228 rxvt_color tint;
229 int shade;
230 int h_blurRadius, v_blurRadius;
231
232 image_effects ()
233 {
234 tint_set =
235 h_blurRadius =
236 v_blurRadius = 0;
237 shade = 100;
238 }
239
240 bool need_tint ()
241 {
242 return shade != 100 || tint_set;
243 }
244
245 bool need_blur ()
246 {
247 return h_blurRadius && v_blurRadius;
248 }
249
250 bool set_tint (const rxvt_color &new_tint);
251 bool set_shade (const char *shade_str);
252 bool set_blur (const char *geom);
253};
254
214# ifdef BG_IMAGE_FROM_FILE 255# if BG_IMAGE_FROM_FILE
215enum { 256enum {
216 IM_IS_SET = 1 << 0,
217 IM_IS_SIZE_SENSITIVE = 1 << 1, 257 IM_IS_SIZE_SENSITIVE = 1 << 1,
218 IM_KEEP_ASPECT = 1 << 2, 258 IM_KEEP_ASPECT = 1 << 2,
219 IM_ROOT_ALIGN = 1 << 3, 259 IM_ROOT_ALIGN = 1 << 3,
220 IM_TILE = 1 << 4, 260 IM_TILE = 1 << 4,
221 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE, 261 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
227 defaultScale = windowScale, 267 defaultScale = windowScale,
228 centerAlign = 50, 268 centerAlign = 50,
229 defaultAlign = centerAlign, 269 defaultAlign = centerAlign,
230}; 270};
231 271
232struct rxvt_image 272struct rxvt_image : image_effects
233{ 273{
274 unsigned short alpha;
234 uint8_t flags; 275 uint8_t flags;
235 unsigned int h_scale, v_scale; /* percents of the window size */ 276 unsigned int h_scale, v_scale; /* percents of the window size */
236 int h_align, v_align; /* percents of the window size: 277 int h_align, v_align; /* percents of the window size:
237 0 - left align, 50 - center, 100 - right */ 278 0 - left align, 50 - center, 100 - right */
238 279
239# ifdef HAVE_PIXBUF 280 bool is_size_sensitive ()
240 GdkPixbuf *pixbuf;
241# endif
242
243 ~rxvt_image ()
244 { 281 {
245# ifdef HAVE_PIXBUF 282 return (!(flags & IM_TILE)
246 if (pixbuf) 283 || h_scale || v_scale
247 g_object_unref (pixbuf); 284 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
248# endif
249 } 285 }
250 286
251 int width () 287 rxvt_img *img;
288
289 void destroy ()
252 { 290 {
253# ifdef HAVE_PIXBUF 291 delete img;
254 return gdk_pixbuf_get_width (pixbuf); 292 img = 0;
255# endif
256 } 293 }
257 int height () 294
258 { 295 rxvt_image ();
259# ifdef HAVE_PIXBUF 296 void set_file_geometry (rxvt_screen *s, const char *file);
260 return gdk_pixbuf_get_height (pixbuf); 297 void set_file (rxvt_screen *s, const char *file);
261# endif
262 }
263 bool set_file (const char *file);
264 bool set_geometry (const char *geom, bool update = false); 298 bool set_geometry (const char *geom, bool update = false);
265 void set_default_geometry ()
266 {
267 h_scale = v_scale = defaultScale;
268 h_align = v_align = defaultAlign;
269 flags |= IM_IS_SIZE_SENSITIVE;
270 }
271}; 299};
272# endif 300# endif
273#endif 301#endif
274 302
275/* 303/*
321 ***************************************************************************** 349 *****************************************************************************
322 */ 350 */
323 351
324/* COLORTERM, TERM environment variables */ 352/* COLORTERM, TERM environment variables */
325#define COLORTERMENV "rxvt" 353#define COLORTERMENV "rxvt"
326#ifdef BG_IMAGE_FROM_FILE 354#if BG_IMAGE_FROM_FILE
327# define COLORTERMENVFULL COLORTERMENV "-xpm" 355# define COLORTERMENVFULL COLORTERMENV "-xpm"
328#else 356#else
329# define COLORTERMENVFULL COLORTERMENV 357# define COLORTERMENVFULL COLORTERMENV
330#endif 358#endif
331#ifndef TERMENV 359#ifndef TERMENV
561#endif 589#endif
562 Color_scroll, 590 Color_scroll,
563#ifdef RXVT_SCROLLBAR 591#ifdef RXVT_SCROLLBAR
564 Color_trough, 592 Color_trough,
565#endif 593#endif
566#if ENABLE_TRANSPARENCY 594#if BG_IMAGE_FROM_ROOT
567 Color_tint, 595 Color_tint,
568#endif 596#endif
569#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
570 Color_fade, 598 Color_fade,
571#endif 599#endif
758 text_t *t; // terminal the text 786 text_t *t; // terminal the text
759 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
760 tlen_t_ l; // length of each text line 788 tlen_t_ l; // length of each text line
761 uint32_t f; // flags 789 uint32_t f; // flags
762 790
791 bool valid ()
792 {
793 return l >= 0;
794 }
795
796 void alloc ()
797 {
798 l = 0;
799 }
800
763 bool is_longer () 801 bool is_longer ()
764 { 802 {
765 return f & LINE_LONGER; 803 return f & LINE_LONGER;
766 } 804 }
767 805
831// that are not representable in unicode, as well as characters 869// that are not representable in unicode, as well as characters
832// not fitting in the BMP. 870// not fitting in the BMP.
833struct compose_char 871struct compose_char
834{ 872{
835 unicode_t c1, c2; // any chars != NOCHAR are valid 873 unicode_t c1, c2; // any chars != NOCHAR are valid
836 #if __cplusplus >= 201103L 874 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
837 compose_char () = default; 875 compose_char () = default;
838 #endif 876 #endif
839 compose_char (unicode_t c1, unicode_t c2) 877 compose_char (unicode_t c1, unicode_t c2)
840 : c1(c1), c2(c2) 878 : c1(c1), c2(c2)
841 { } 879 { }
1037 scrollBar_t scrollBar; 1075 scrollBar_t scrollBar;
1038 uint8_t options[(Opt_count + 7) >> 3]; 1076 uint8_t options[(Opt_count + 7) >> 3];
1039 XSizeHints szHint; 1077 XSizeHints szHint;
1040 rxvt_color *pix_colors; 1078 rxvt_color *pix_colors;
1041 Cursor TermWin_cursor; /* cursor for vt window */ 1079 Cursor TermWin_cursor; /* cursor for vt window */
1080
1042 line_t *row_buf; // all lines, scrollback + terminal, circular 1081 line_t *row_buf; // all lines, scrollback + terminal, circular
1043 line_t *drawn_buf; // text on screen 1082 line_t *drawn_buf; // text on screen
1044 line_t *swap_buf; // lines for swap buffer 1083 line_t *swap_buf; // lines for swap buffer
1045 char *tabs; /* per location: 1 == tab-stop */ 1084 char *tabs; /* per location: 1 == tab-stop */
1046 screen_t screen; 1085 screen_t screen;
1142/* ---------- */ 1181/* ---------- */
1143 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1144 XComposeStatus compose; 1183 XComposeStatus compose;
1145 static struct termios def_tio; 1184 static struct termios def_tio;
1146 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1147#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1148 void bg_init (); 1188 void bg_init ();
1149 void bg_destroy (); 1189 void bg_destroy ();
1150 1190
1191# if BG_IMAGE_FROM_FILE
1192 rxvt_image fimage;
1193 void render_image (rxvt_image &image);
1194# endif
1195
1196# if BG_IMAGE_FROM_ROOT
1197 rxvt_img *root_img;
1198 image_effects root_effects;
1199
1200 void render_root_image ();
1201# endif
1202
1203 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1204
1205 ev_tstamp bg_valid_since;
1206
1207 bool bg_window_size_sensitive ();
1208 bool bg_window_position_sensitive ();
1209
1210 void bg_render ();
1211#endif
1212
1213#ifdef HAVE_IMG
1151 enum { 1214 enum {
1152 BG_IS_VALID = 1 << 0,
1153
1154 BG_IS_TRANSPARENT = 1 << 1, 1215 BG_IS_TRANSPARENT = 1 << 1,
1155 BG_NEEDS_REFRESH = 1 << 2, 1216 BG_NEEDS_REFRESH = 1 << 2,
1156
1157 BG_HAS_RENDER = 1 << 3,
1158 BG_HAS_RENDER_CONV = 1 << 4,
1159 BG_CLIENT_RENDER = 1 << 5, 1217 BG_INHIBIT_RENDER = 1 << 3,
1160
1161 BG_TINT_SET = 1 << 6,
1162 BG_TINT_BITAND = 1 << 7,
1163 }; 1218 };
1164 1219
1165 uint8_t bg_flags; 1220 uint8_t bg_flags;
1166 1221
1167# ifdef BG_IMAGE_FROM_FILE
1168 rxvt_image bg_image; 1222 rxvt_img *bg_img;
1169 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1170 bool render_image (rxvt_image &image);
1171# endif
1172
1173# ifdef ENABLE_TRANSPARENCY
1174 Pixmap root_pixmap; /* current root pixmap set */
1175 rxvt_color tint;
1176 int shade;
1177 int h_blurRadius, v_blurRadius;
1178
1179 void bg_set_transparent ()
1180 {
1181 bg_flags |= BG_IS_TRANSPARENT;
1182 }
1183 void bg_set_root_pixmap ();
1184 bool bg_set_tint (rxvt_color &new_tint);
1185 bool bg_set_shade (const char *shade_str);
1186 bool bg_set_blur (const char *geom);
1187
1188 bool blur_pixmap (Pixmap pixmap, int width, int height);
1189 bool tint_pixmap (Pixmap pixmap, int width, int height);
1190 void tint_ximage (XImage *ximage);
1191 bool make_transparency_pixmap ();
1192# endif
1193
1194 ev_tstamp bg_valid_since;
1195
1196 Pixmap bg_pixmap;
1197 unsigned int bg_pmap_width, bg_pmap_height;
1198
1199 int target_x;
1200 int target_y;
1201 bool bg_set_position (int x, int y);
1202 bool bg_window_size_sensitive ();
1203 bool bg_window_position_sensitive ();
1204
1205 bool bg_render ();
1206 void bg_invalidate ()
1207 {
1208 bg_flags &= ~BG_IS_VALID;
1209 }
1210#endif
1211#ifdef HAVE_PIXBUF
1212 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1213 int src_x, int src_y, int dst_x, int dst_y,
1214 unsigned int width, unsigned int height);
1215#endif 1223#endif
1216 1224
1217#if ENABLE_OVERLAY 1225#if ENABLE_OVERLAY
1218 overlay_base ov; 1226 overlay_base ov;
1219 1227
1227 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1235 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1228#endif 1236#endif
1229 1237
1230 vector<void *> allocated; // free these memory blocks with free() 1238 vector<void *> allocated; // free these memory blocks with free()
1231 1239
1240 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1241
1232 char *locale; 1242 char *locale;
1233 char charsets[4]; 1243 char charsets[4];
1234 char *v_buffer; /* pointer to physical buffer */ 1244 char *v_buffer; /* pointer to physical buffer */
1235 unsigned int v_buflen; /* size of area to write */ 1245 unsigned int v_buflen; /* size of area to write */
1236 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1246 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1247 char *cmdbuf_ptr, *cmdbuf_endp; 1257 char *cmdbuf_ptr, *cmdbuf_endp;
1248 char cmdbuf_base[CBUFSIZ]; 1258 char cmdbuf_base[CBUFSIZ];
1249 1259
1250 ptytty *pty; 1260 ptytty *pty;
1251 1261
1252 rxvt_salloc *talloc; // text line allocator 1262 // chunk contains all line_t's as well as rend_t and text_t buffers
1253 rxvt_salloc *ralloc; // rend line allocator 1263 // for drawn_buf, swap_buf and row_buf, in this order
1264 void *chunk;
1265 size_t chunk_size;
1254 1266
1255 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1267 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1256 1268
1257#if ENABLE_FRILLS || ISO_14755 1269#if ENABLE_FRILLS || ISO_14755
1258 // ISO 14755 entry support 1270 // ISO 14755 entry support
1259 unicode_t iso14755buf; 1271 unicode_t iso14755buf;
1260 void commit_iso14755 (); 1272 void commit_iso14755 ();
1261# if ISO_14755 1273# if ISO_14755
1262 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1274 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1263 void iso14755_54 (int x, int y); 1275 void iso14755_54 (int x, int y);
1264# endif 1276# endif
1265#endif 1277#endif
1266 1278
1267 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1279 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1269 void vt_select_input () const NOTHROW 1281 void vt_select_input () const NOTHROW
1270 { 1282 {
1271 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1283 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1272 } 1284 }
1273 1285
1274#if ENABLE_TRANSPARENCY || ENABLE_PERL 1286#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1275 void rootwin_cb (XEvent &xev); 1287 void rootwin_cb (XEvent &xev);
1276 xevent_watcher rootwin_ev; 1288 xevent_watcher rootwin_ev;
1277#endif 1289#endif
1278#ifdef HAVE_BG_PIXMAP 1290#ifdef HAVE_BG_PIXMAP
1279 void update_background (); 1291 void update_background ();
1428 char *get_colorfgbg (); 1440 char *get_colorfgbg ();
1429 bool set_color (rxvt_color &color, const char *name); 1441 bool set_color (rxvt_color &color, const char *name);
1430 void alias_color (int dst, int src); 1442 void alias_color (int dst, int src);
1431 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1443 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1432 void get_window_origin (int &x, int &y); 1444 void get_window_origin (int &x, int &y);
1433 Pixmap get_pixmap_property (Atom property);
1434 1445
1435 // screen.C 1446 // screen.C
1436 1447
1437 void lalloc (line_t &l) const 1448 bool option (uint8_t opt) const NOTHROW
1438 { 1449 {
1439 l.t = (text_t *)talloc->alloc (); 1450 return options[opt >> 3] & (1 << (opt & 7));
1440 l.r = (rend_t *)ralloc->alloc ();
1441 } 1451 }
1442 1452
1443#if 0 1453 void set_option (uint8_t opt, bool set = true) NOTHROW;
1444 void lfree (line_t &l)
1445 {
1446 talloc->free (l.t);
1447 ralloc->free (l.r);
1448 }
1449#endif
1450
1451 void lresize (line_t &l) const
1452 {
1453 if (!l.t)
1454 return;
1455
1456 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1457 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1458
1459 l.l = min (l.l, ncol);
1460
1461 if (ncol > prev_ncol)
1462 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1463 }
1464 1454
1465 int fgcolor_of (rend_t r) const NOTHROW 1455 int fgcolor_of (rend_t r) const NOTHROW
1466 { 1456 {
1467 int base = GET_BASEFG (r); 1457 int base = GET_BASEFG (r);
1468#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
1488 base += minBrightCOLOR - minCOLOR; 1478 base += minBrightCOLOR - minCOLOR;
1489#endif 1479#endif
1490 return base; 1480 return base;
1491 } 1481 }
1492 1482
1493 bool option (uint8_t opt) const NOTHROW
1494 {
1495 return options[opt >> 3] & (1 << (opt & 7));
1496 }
1497
1498 void set_option (uint8_t opt, bool set = true) NOTHROW;
1499
1500 // modifies first argument(!) 1483 // modifies first argument(!)
1501 void tt_paste (char *data, unsigned int len) NOTHROW; 1484 void tt_paste (char *data, unsigned int len) NOTHROW;
1502 void paste (char *data, unsigned int len) NOTHROW; 1485 void paste (char *data, unsigned int len) NOTHROW;
1486 void scr_alloc () NOTHROW;
1503 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1487 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1504 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1488 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1505 void scr_kill_char (line_t &l, int col) const NOTHROW; 1489 void scr_kill_char (line_t &l, int col) const NOTHROW;
1506 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1490 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1491 void copy_line (line_t &dst, line_t &src);
1507 void scr_reset (); 1492 void scr_reset ();
1508 void scr_release () NOTHROW; 1493 void scr_release () NOTHROW;
1509 void scr_clear (bool really = false) NOTHROW; 1494 void scr_clear (bool really = false) NOTHROW;
1510 void scr_refresh () NOTHROW; 1495 void scr_refresh () NOTHROW;
1511 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW; 1496 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1574 void selection_click (int clicks, int x, int y) NOTHROW; 1559 void selection_click (int clicks, int x, int y) NOTHROW;
1575 void selection_extend (int x, int y, int flag) NOTHROW; 1560 void selection_extend (int x, int y, int flag) NOTHROW;
1576 void selection_rotate (int x, int y) NOTHROW; 1561 void selection_rotate (int x, int y) NOTHROW;
1577 1562
1578 // xdefaults.C 1563 // xdefaults.C
1564 void rxvt_usage (int type);
1579 const char **get_options (int argc, const char *const *argv); 1565 const char **get_options (int argc, const char *const *argv);
1580 int parse_keysym (const char *str, const char *arg); 1566 int parse_keysym (const char *str, const char *arg);
1581 const char *x_resource (const char *name); 1567 const char *x_resource (const char *name);
1582 void extract_resources (); 1568 void extract_resources ();
1583 void extract_keysym_resources (); 1569 void extract_keysym_resources ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines