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.251 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.283 by sasha, Fri Aug 3 22:40:10 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1 20# define ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
22#else 23#else
23# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
24#endif 25#endif
25 26
26#include <limits.h> 27#include <limits.h>
… …
69 70
70#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
71typedef char *XPointer; 72typedef char *XPointer;
72#endif 73#endif
73 74
74#ifdef HAVE_TERMIOS_H
75# include <termios.h> 75#include <termios.h>
76typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
77#else
78# include <sgtty.h>
79typedef struct {
80 struct sgttyb sg;
81 struct tchars tc;
82 struct ltchars lc;
83 int line;
84 int local;
85} ttymode_t;
86#endif
87 77
88#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
89# ifdef XPM_INC_X11 79# include <afterimage.h>
90# include <X11/xpm.h> 80#undef min
91# else 81#undef max
92# include <xpm.h>
93# endif
94#endif 82#endif
95 83
96#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
97# define STDIN_FILENO 0 85# define STDIN_FILENO 0
98# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
… …
123// misc.C 111// misc.C
124char * rxvt_wcstombs (const wchar_t *str, int len = -1); 112char * rxvt_wcstombs (const wchar_t *str, int len = -1);
125wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 113wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
126char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 114char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
127wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 115wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
128char * rxvt_strdup_cpp (const char *str);
129 116
130#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 117#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
131 118
132char * rxvt_r_basename (const char *str) NOTHROW; 119char * rxvt_r_basename (const char *str) NOTHROW;
133void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 120void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
140const char * rxvt_Str_skip_space (const char *str) NOTHROW; 127const char * rxvt_Str_skip_space (const char *str) NOTHROW;
141char * rxvt_Str_trim (char *str) NOTHROW; 128char * rxvt_Str_trim (char *str) NOTHROW;
142int rxvt_Str_escaped (char *str) NOTHROW; 129int rxvt_Str_escaped (char *str) NOTHROW;
143char ** rxvt_splitcommastring (const char *cs) NOTHROW; 130char ** rxvt_splitcommastring (const char *cs) NOTHROW;
144void rxvt_freecommastring (char **cs) NOTHROW; 131void rxvt_freecommastring (char **cs) NOTHROW;
145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
146 132
147///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
148 134
149// temporarily replace the process environment 135// temporarily replace the process environment
150extern char **environ; 136extern char **environ;
… …
184# define KEEP_SCROLLCOLOR 1 170# define KEEP_SCROLLCOLOR 1
185#else 171#else
186# undef KEEP_SCROLLCOLOR 172# undef KEEP_SCROLLCOLOR
187#endif 173#endif
188 174
175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
176# define HAVE_BG_PIXMAP 1/* to simplify further usage */
177struct bgPixmap_t {
189#ifdef XPM_BACKGROUND 178# ifdef XPM_BACKGROUND
190typedef struct { 179
191 short w, h, x, y; 180# ifdef HAVE_AFTERIMAGE
181 ASImage *original_asim;
182# endif
183
184 unsigned int h_scale, v_scale;/* percents of the window size */
185 int h_align, v_align; /* percents of the window size:
186 0 - left align, 50 - center, 100 - right */
187
188 bool handle_geometry (const char *geom);
189
190# endif
191
192# define bgPmap_geometrySet (1UL<<0)
193# define bgPmap_hScale (1UL<<1)
194# define bgPmap_vScale (1UL<<2)
195# define bgPmap_Scale (bgPmap_hScale|bgPmap_vScale)
196# define bgPmap_propScale (1UL<<3)
197# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_Scale|bgPmap_propScale)
198
199# define bgPmap_Transparent (1UL<<16)
200 unsigned long flags;
201
192 Pixmap pixmap; 202 Pixmap pixmap;
193} bgPixmap_t; 203 unsigned int pmap_width, pmap_height;
204 unsigned int pmap_depth;
205
206 bool window_size_sensitive();
207
208};
209#else
210# undef HAVE_BG_PIXMAP
194#endif 211#endif
195 212
196/* 213/*
197 * the 'essential' information for reporting Mouse Events 214 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 215 * pared down from XButtonEvent
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 536 * on the unnecessary items, e.g. Color_pointer, but won't bother
520 * until we need to. Also, be aware of usage in pixcolor_set 537 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 538 */
522 539
523enum colour_list { 540enum colour_list {
541 Color_none = -2,
542 Color_transparent = -1,
524 Color_fg = 0, 543 Color_fg = 0,
525 Color_bg, 544 Color_bg,
526 minCOLOR, /* 2 */ 545 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 546 Color_Black = minCOLOR,
528 Color_Red3, 547 Color_Red3,
… …
681 * MACRO DEFINES 700 * MACRO DEFINES
682 ***************************************************************************** 701 *****************************************************************************
683 */ 702 */
684#define dLocal(type,name) type const name = this->name 703#define dLocal(type,name) type const name = this->name
685 704
686// for speed reasons, we assume that all latin1 characters 705// for speed reasons, we assume that all codepoints 32 to 126 are
687// are single-width (the first unicode combining character 706// single-width.
688// is actually 0x300, but ascii is what matters most). 707#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
690 708
691/* convert pixel dimensions to row/column values. Everything as int32_t */ 709/* convert pixel dimensions to row/column values. Everything as int32_t */
692#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 710#define Pixel2Col(x) Pixel2Width((int32_t)(x))
693#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 711#define Pixel2Row(y) Pixel2Height((int32_t)(y))
694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 712#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
696#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 714#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
697#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 715#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
698#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 716#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
699#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 717#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
700 718
701#define OPTION(opt) (options & (opt))
702#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
703 | Opt_jumpScroll | Opt_secondaryScreen \
704 | Opt_pastableTabs | Opt_intensityStyles)
705
706// for m >= -n, ensure remainder lies between 0..n-1 719// for m >= -n, ensure remainder lies between 0..n-1
707#define MOD(m,n) (((m) + (n)) % (n)) 720#define MOD(m,n) (((m) + (n)) % (n))
708 721
709#define LINENO(n) MOD (term_start + int(n), total_rows) 722#define LINENO(n) MOD (term_start + int(n), total_rows)
710#define ROW(n) row_buf [LINENO (n)] 723#define ROW(n) row_buf [LINENO (n)]
… …
767#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 780#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
768#define scrollbar_position(y) ((y) - scrollBar.beg) 781#define scrollbar_position(y) ((y) - scrollBar.beg)
769#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 782#define scrollbar_size() (scrollBar.end - scrollBar.beg \
770 - scrollbar_minheight ()) 783 - scrollbar_minheight ())
771 784
772#ifdef XPM_BACKGROUND
773# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
774#else
775# define XPMClearArea(a, b, c, d, e, f, g)
776#endif
777
778typedef callback1<void, const char *> log_callback; 785typedef callback<void (const char *)> log_callback;
779typedef callback1<int, int> getfd_callback; 786typedef callback<int (int)> getfd_callback;
780 787
781#define SET_LOCALE(locale) rxvt_set_locale (locale) 788#define SET_LOCALE(locale) rxvt_set_locale (locale)
782extern bool rxvt_set_locale (const char *locale) NOTHROW; 789extern bool rxvt_set_locale (const char *locale) NOTHROW;
783extern void rxvt_push_locale (const char *locale) NOTHROW; 790extern void rxvt_push_locale (const char *locale) NOTHROW;
784extern void rxvt_pop_locale () NOTHROW; 791extern void rxvt_pop_locale () NOTHROW;
… …
786/****************************************************************************/ 793/****************************************************************************/
787 794
788#define LINE_LONGER 0x0001 // line is continued on the next row 795#define LINE_LONGER 0x0001 // line is continued on the next row
789#define LINE_FILTERED 0x0002 // line has been filtered 796#define LINE_FILTERED 0x0002 // line has been filtered
790#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 797#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
798#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
799#define LINE_BIDI 0x0010 // line needs bidi (NYI)
791 800
792struct line_t { 801struct line_t {
793 text_t *t; // terminal the text 802 text_t *t; // terminal the text
794 rend_t *r; // rendition, uses RS_ flags 803 rend_t *r; // rendition, uses RS_ flags
795 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 804 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
888#endif 897#endif
889 898
890/****************************************************************************/ 899/****************************************************************************/
891 900
892#ifdef KEYSYM_RESOURCE 901#ifdef KEYSYM_RESOURCE
893 class keyboard_manager; 902class keyboard_manager;
894#endif 903#endif
895 904
896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 905struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
906
907 // special markers with magic addresses
908 static const char resval_undef []; // options specifically unset
909 static const char resval_on []; // boolean options switched on
910 static const char resval_off []; // or off
911
897 log_callback *log_hook; // log error messages through this hook, if != 0 912 log_callback *log_hook; // log error messages through this hook, if != 0
898 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 913 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
899#if ENABLE_PERL 914#if ENABLE_PERL
900 rxvt_perl_term perl; 915 rxvt_perl_term perl;
901#endif 916#endif
902 struct mbstate mbstate; // current input multibyte state 917 struct mbstate mbstate; // current input multibyte state
903 918
904 unsigned char want_refresh:1, 919 unsigned char want_refresh:1,
905#ifdef TRANSPARENT 920#ifdef ENABLE_TRANSPARENCY
906 want_full_refresh:1, /* awaiting full screen refresh */ 921 want_full_refresh:1, /* awaiting full screen refresh */
907#endif
908#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
909 am_transparent:1, /* is a transparent term */ 922 am_transparent:1, /* is a transparent term */
910 am_pixmap_trans:1, /* transparency w/known root pixmap */ 923 am_pixmap_trans:1, /* transparency w/known root pixmap */
911#endif 924#endif
912 current_screen:1, /* primary or secondary */ 925 current_screen:1, /* primary or secondary */
913 num_scr_allow:1, 926 num_scr_allow:1,
… …
956 /* give proper Scroll behaviour */ 969 /* give proper Scroll behaviour */
957#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 970#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
958 mouse_slip_wheel_speed, 971 mouse_slip_wheel_speed,
959#endif 972#endif
960 refresh_count, 973 refresh_count,
961 refresh_limit,
962 last_bot, /* scrollbar last bottom position */ 974 last_bot, /* scrollbar last bottom position */
963 last_top, /* scrollbar last top position */ 975 last_top, /* scrollbar last top position */
964 last_state, /* scrollbar last state */ 976 last_state, /* scrollbar last state */
965 scrollbar_len, 977 scrollbar_len,
966 window_vt_x, 978 window_vt_x,
… …
1022#endif 1034#endif
1023 struct mouse_event MEvent; 1035 struct mouse_event MEvent;
1024 XComposeStatus compose; 1036 XComposeStatus compose;
1025 ttymode_t tio; 1037 ttymode_t tio;
1026 row_col_t oldcursor; 1038 row_col_t oldcursor;
1027#ifdef XPM_BACKGROUND 1039#ifdef HAVE_BG_PIXMAP
1028 bgPixmap_t bgPixmap; 1040 bgPixmap_t bgPixmap;
1029 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1041#endif
1042#ifdef HAVE_AFTERIMAGE
1043 ASVisual *asv;
1044 ASImageManager *asimman;
1030#endif 1045#endif
1031 1046
1032#if ENABLE_OVERLAY 1047#if ENABLE_OVERLAY
1033 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1048 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1034 text_t **ov_text; 1049 text_t **ov_text;
… …
1089 1104
1090 long vt_emask, vt_emask_perl, vt_emask_xim; 1105 long vt_emask, vt_emask_perl, vt_emask_xim;
1091 1106
1092 void vt_select_input () const NOTHROW 1107 void vt_select_input () const NOTHROW
1093 { 1108 {
1094 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1109 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1095 } 1110 }
1096 1111
1097#if TRANSPARENT 1112#if ENABLE_TRANSPARENCY || ENABLE_PERL
1098 void rootwin_cb (XEvent &xev); 1113 void rootwin_cb (XEvent &xev);
1099 xevent_watcher rootwin_ev; 1114 xevent_watcher rootwin_ev;
1115#endif
1116#if ENABLE_TRANSPARENCY
1117 int check_our_parents ();
1118 void check_our_parents_cb (time_watcher &w);
1119 time_watcher check_our_parents_ev;
1100#endif 1120#endif
1101 1121
1102 void x_cb (XEvent &xev); 1122 void x_cb (XEvent &xev);
1103 void flush (); 1123 void flush ();
1104 xevent_watcher termwin_ev; 1124 xevent_watcher termwin_ev;
… …
1164 bool pty_fill (); 1184 bool pty_fill ();
1165 1185
1166 void make_current () const // make this the "currently active" urxvt instance 1186 void make_current () const // make this the "currently active" urxvt instance
1167 { 1187 {
1168 SET_R (this); 1188 SET_R (this);
1189 set_environ (envv);
1169 rxvt_set_locale (locale); 1190 rxvt_set_locale (locale);
1170 set_environ (envv);
1171 } 1191 }
1172 1192
1173 void init_secondary (); 1193 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv); 1194 const char **init_resources (int argc, const char *const *argv);
1175 const char *x_resource (const char *name); 1195 const char *x_resource (const char *name);
… …
1200 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1220 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1201 1221
1202 bool IMisRunning (); 1222 bool IMisRunning ();
1203 void IMSendSpot (); 1223 void IMSendSpot ();
1204 bool IM_get_IC (const char *modifiers); 1224 bool IM_get_IC (const char *modifiers);
1205 void IMSetStatusPosition (); 1225 void IMSetPosition ();
1206#endif 1226#endif
1207 1227
1208 void resize_scrollbar (); 1228 void resize_scrollbar ();
1209 1229
1210 // command.C 1230 // command.C
1211 void lookup_key (XKeyEvent &ev); 1231 void key_press (XKeyEvent &ev);
1232 void key_release (XKeyEvent &ev);
1212 unsigned int cmd_write (const char *str, unsigned int count); 1233 unsigned int cmd_write (const char *str, unsigned int count);
1213 1234
1214 wchar_t next_char () NOTHROW; 1235 wchar_t next_char () NOTHROW;
1215 wchar_t cmd_getc () THROW ((class out_of_input)); 1236 wchar_t cmd_getc () THROW ((class out_of_input));
1216 uint32_t next_octet () NOTHROW; 1237 uint32_t next_octet () NOTHROW;
… …
1220 void mouse_report (XButtonEvent &ev); 1241 void mouse_report (XButtonEvent &ev);
1221 void button_press (XButtonEvent &ev); 1242 void button_press (XButtonEvent &ev);
1222 void button_release (XButtonEvent &ev); 1243 void button_release (XButtonEvent &ev);
1223 void focus_in (); 1244 void focus_in ();
1224 void focus_out (); 1245 void focus_out ();
1225 int check_our_parents (); 1246 void update_fade_color (unsigned int idx);
1226#ifdef PRINTPIPE 1247#ifdef PRINTPIPE
1227 FILE *popen_printer (); 1248 FILE *popen_printer ();
1228 int pclose_printer (FILE *stream); 1249 int pclose_printer (FILE *stream);
1229#endif 1250#endif
1230 void process_print_pipe (); 1251 void process_print_pipe ();
… …
1252 void set_title (const char *str); 1273 void set_title (const char *str);
1253 void set_icon_name (const char *str); 1274 void set_icon_name (const char *str);
1254 void set_window_color (int idx, const char *color); 1275 void set_window_color (int idx, const char *color);
1255 void set_colorfgbg (); 1276 void set_colorfgbg ();
1256 bool set_color (rxvt_color &color, const char *name); 1277 bool set_color (rxvt_color &color, const char *name);
1278 void alias_color (int dst, int src);
1257 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1279 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1258 1280
1259 // screen.C 1281 // screen.C
1260 1282
1261 void lalloc (line_t &l) const 1283 void lalloc (line_t &l) const
… …
1290 { 1312 {
1291 int base = GET_BASEFG (r); 1313 int base = GET_BASEFG (r);
1292#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1293 if (r & RS_Bold 1315 if (r & RS_Bold
1294# if ENABLE_STYLES 1316# if ENABLE_STYLES
1295 && OPTION (Opt_intensityStyles) 1317 && option (Opt_intensityStyles)
1296# endif 1318# endif
1297 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1298 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1299#endif 1321#endif
1300 return base; 1322 return base;
… …
1304 { 1326 {
1305 int base = GET_BASEBG (r); 1327 int base = GET_BASEBG (r);
1306#ifndef NO_BRIGHTCOLOR 1328#ifndef NO_BRIGHTCOLOR
1307 if (r & RS_Blink 1329 if (r & RS_Blink
1308# if ENABLE_STYLES 1330# if ENABLE_STYLES
1309 && OPTION (Opt_intensityStyles) 1331 && option (Opt_intensityStyles)
1310# endif 1332# endif
1311 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1312 base += minBrightCOLOR - minCOLOR; 1334 base += minBrightCOLOR - minCOLOR;
1313#endif 1335#endif
1314 return base; 1336 return base;
1315 } 1337 }
1316 1338
1317 bool option (uint32_t opt) const NOTHROW 1339 bool option (uint8_t opt) const NOTHROW
1318 { 1340 {
1319 return OPTION (opt); 1341 return options[opt >> 3] & (1 << (opt & 7));
1320 } 1342 }
1321 1343
1322 void set_option (uint32_t opt, bool set) NOTHROW 1344 void set_option (uint8_t opt, bool set = true) NOTHROW
1323 { 1345 {
1324 if (set) 1346 if (set)
1325 options |= opt; 1347 options[opt >> 3] |= (1 << (opt & 7));
1326 else 1348 else
1327 options &= ~opt; 1349 options[opt >> 3] &= ~(1 << (opt & 7));
1328 } 1350 }
1329 1351
1330 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1352 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1331 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1353 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1332 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1354 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1438 void get_options (int argc, const char *const *argv); 1460 void get_options (int argc, const char *const *argv);
1439 int parse_keysym (const char *str, const char *arg); 1461 int parse_keysym (const char *str, const char *arg);
1440 void get_xdefaults (FILE *stream, const char *name); 1462 void get_xdefaults (FILE *stream, const char *name);
1441 void extract_resources (); 1463 void extract_resources ();
1442 // xpm.C 1464 // xpm.C
1443 int scale_pixmap (const char *geom); 1465//int scale_pixmap (const char *geom);
1444 void resize_pixmap (); 1466 void resize_pixmap ();
1445 Pixmap set_bgPixmap (const char *file); 1467 void set_bgPixmap (const char *file);
1446}; 1468};
1447 1469
1448/* 1470/*
1449 ***************************************************************************** 1471 *****************************************************************************
1450 * PROTOTYPES 1472 * PROTOTYPES

Diff Legend

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