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.285 by sasha, Sat Aug 4 07:05:31 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#define bgPmap_defaultScale 100
185#define bgPmap_defaultAlign 50
186 unsigned int h_scale, v_scale;/* percents of the window size */
187 int h_align, v_align; /* percents of the window size:
188 0 - left align, 50 - center, 100 - right */
189
190 bool handle_geometry (const char *geom);
191
192# endif
193
194# define bgPmap_geometrySet (1UL<<0)
195# define bgPmap_propScale (1UL<<1)
196# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_propScale)
197
198# define bgPmap_Transparent (1UL<<16)
199 unsigned long flags;
200
192 Pixmap pixmap; 201 Pixmap pixmap;
193} bgPixmap_t; 202 unsigned int pmap_width, pmap_height;
203 unsigned int pmap_depth;
204
205 bool window_size_sensitive();
206
207};
208#else
209# undef HAVE_BG_PIXMAP
194#endif 210#endif
195 211
196/* 212/*
197 * the 'essential' information for reporting Mouse Events 213 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 214 * pared down from XButtonEvent
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 535 * 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 536 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 537 */
522 538
523enum colour_list { 539enum colour_list {
540 Color_none = -2,
541 Color_transparent = -1,
524 Color_fg = 0, 542 Color_fg = 0,
525 Color_bg, 543 Color_bg,
526 minCOLOR, /* 2 */ 544 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 545 Color_Black = minCOLOR,
528 Color_Red3, 546 Color_Red3,
… …
570#endif 588#endif
571#ifdef KEEP_SCROLLCOLOR 589#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 590 Color_scroll,
573 Color_trough, 591 Color_trough,
574#endif 592#endif
575#if TINTING 593#if ENABLE_TRANSPARENCY
576 Color_tint, 594 Color_tint,
577#endif 595#endif
578#if OFF_FOCUS_FADING 596#if OFF_FOCUS_FADING
579 Color_fade, 597 Color_fade,
580#endif 598#endif
… …
681 * MACRO DEFINES 699 * MACRO DEFINES
682 ***************************************************************************** 700 *****************************************************************************
683 */ 701 */
684#define dLocal(type,name) type const name = this->name 702#define dLocal(type,name) type const name = this->name
685 703
686// for speed reasons, we assume that all latin1 characters 704// for speed reasons, we assume that all codepoints 32 to 126 are
687// are single-width (the first unicode combining character 705// single-width.
688// is actually 0x300, but ascii is what matters most). 706#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
690 707
691/* convert pixel dimensions to row/column values. Everything as int32_t */ 708/* convert pixel dimensions to row/column values. Everything as int32_t */
692#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 709#define Pixel2Col(x) Pixel2Width((int32_t)(x))
693#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 710#define Pixel2Row(y) Pixel2Height((int32_t)(y))
694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 711#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
696#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 713#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
697#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 714#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
698#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
699#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
700 717
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 718// for m >= -n, ensure remainder lies between 0..n-1
707#define MOD(m,n) (((m) + (n)) % (n)) 719#define MOD(m,n) (((m) + (n)) % (n))
708 720
709#define LINENO(n) MOD (term_start + int(n), total_rows) 721#define LINENO(n) MOD (term_start + int(n), total_rows)
710#define ROW(n) row_buf [LINENO (n)] 722#define ROW(n) row_buf [LINENO (n)]
… …
767#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 779#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
768#define scrollbar_position(y) ((y) - scrollBar.beg) 780#define scrollbar_position(y) ((y) - scrollBar.beg)
769#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 781#define scrollbar_size() (scrollBar.end - scrollBar.beg \
770 - scrollbar_minheight ()) 782 - scrollbar_minheight ())
771 783
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; 784typedef callback<void (const char *)> log_callback;
779typedef callback1<int, int> getfd_callback; 785typedef callback<int (int)> getfd_callback;
780 786
781#define SET_LOCALE(locale) rxvt_set_locale (locale) 787#define SET_LOCALE(locale) rxvt_set_locale (locale)
782extern bool rxvt_set_locale (const char *locale) NOTHROW; 788extern bool rxvt_set_locale (const char *locale) NOTHROW;
783extern void rxvt_push_locale (const char *locale) NOTHROW; 789extern void rxvt_push_locale (const char *locale) NOTHROW;
784extern void rxvt_pop_locale () NOTHROW; 790extern void rxvt_pop_locale () NOTHROW;
… …
786/****************************************************************************/ 792/****************************************************************************/
787 793
788#define LINE_LONGER 0x0001 // line is continued on the next row 794#define LINE_LONGER 0x0001 // line is continued on the next row
789#define LINE_FILTERED 0x0002 // line has been filtered 795#define LINE_FILTERED 0x0002 // line has been filtered
790#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 796#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
797#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
798#define LINE_BIDI 0x0010 // line needs bidi (NYI)
791 799
792struct line_t { 800struct line_t {
793 text_t *t; // terminal the text 801 text_t *t; // terminal the text
794 rend_t *r; // rendition, uses RS_ flags 802 rend_t *r; // rendition, uses RS_ flags
795 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 803 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
888#endif 896#endif
889 897
890/****************************************************************************/ 898/****************************************************************************/
891 899
892#ifdef KEYSYM_RESOURCE 900#ifdef KEYSYM_RESOURCE
893 class keyboard_manager; 901class keyboard_manager;
894#endif 902#endif
895 903
896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 904struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
905
906 // special markers with magic addresses
907 static const char resval_undef []; // options specifically unset
908 static const char resval_on []; // boolean options switched on
909 static const char resval_off []; // or off
910
897 log_callback *log_hook; // log error messages through this hook, if != 0 911 log_callback *log_hook; // log error messages through this hook, if != 0
898 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 912 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
899#if ENABLE_PERL 913#if ENABLE_PERL
900 rxvt_perl_term perl; 914 rxvt_perl_term perl;
901#endif 915#endif
902 struct mbstate mbstate; // current input multibyte state 916 struct mbstate mbstate; // current input multibyte state
903 917
904 unsigned char want_refresh:1, 918 unsigned char want_refresh:1,
905#ifdef TRANSPARENT 919#ifdef ENABLE_TRANSPARENCY
906 want_full_refresh:1, /* awaiting full screen refresh */ 920 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 */ 921 am_transparent:1, /* is a transparent term */
910 am_pixmap_trans:1, /* transparency w/known root pixmap */ 922 am_pixmap_trans:1, /* transparency w/known root pixmap */
911#endif 923#endif
912 current_screen:1, /* primary or secondary */ 924 current_screen:1, /* primary or secondary */
913 num_scr_allow:1, 925 num_scr_allow:1,
… …
956 /* give proper Scroll behaviour */ 968 /* give proper Scroll behaviour */
957#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 969#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
958 mouse_slip_wheel_speed, 970 mouse_slip_wheel_speed,
959#endif 971#endif
960 refresh_count, 972 refresh_count,
961 refresh_limit,
962 last_bot, /* scrollbar last bottom position */ 973 last_bot, /* scrollbar last bottom position */
963 last_top, /* scrollbar last top position */ 974 last_top, /* scrollbar last top position */
964 last_state, /* scrollbar last state */ 975 last_state, /* scrollbar last state */
965 scrollbar_len, 976 scrollbar_len,
966 window_vt_x, 977 window_vt_x,
… …
1022#endif 1033#endif
1023 struct mouse_event MEvent; 1034 struct mouse_event MEvent;
1024 XComposeStatus compose; 1035 XComposeStatus compose;
1025 ttymode_t tio; 1036 ttymode_t tio;
1026 row_col_t oldcursor; 1037 row_col_t oldcursor;
1027#ifdef XPM_BACKGROUND 1038#ifdef HAVE_BG_PIXMAP
1028 bgPixmap_t bgPixmap; 1039 bgPixmap_t bgPixmap;
1029 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1040#endif
1041#ifdef HAVE_AFTERIMAGE
1042 ASVisual *asv;
1043 ASImageManager *asimman;
1030#endif 1044#endif
1031 1045
1032#if ENABLE_OVERLAY 1046#if ENABLE_OVERLAY
1033 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1047 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1034 text_t **ov_text; 1048 text_t **ov_text;
… …
1089 1103
1090 long vt_emask, vt_emask_perl, vt_emask_xim; 1104 long vt_emask, vt_emask_perl, vt_emask_xim;
1091 1105
1092 void vt_select_input () const NOTHROW 1106 void vt_select_input () const NOTHROW
1093 { 1107 {
1094 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1108 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1095 } 1109 }
1096 1110
1097#if TRANSPARENT 1111#if ENABLE_TRANSPARENCY || ENABLE_PERL
1098 void rootwin_cb (XEvent &xev); 1112 void rootwin_cb (XEvent &xev);
1099 xevent_watcher rootwin_ev; 1113 xevent_watcher rootwin_ev;
1114#endif
1115#if ENABLE_TRANSPARENCY
1116 int check_our_parents ();
1117 void check_our_parents_cb (time_watcher &w);
1118 time_watcher check_our_parents_ev;
1100#endif 1119#endif
1101 1120
1102 void x_cb (XEvent &xev); 1121 void x_cb (XEvent &xev);
1103 void flush (); 1122 void flush ();
1104 xevent_watcher termwin_ev; 1123 xevent_watcher termwin_ev;
… …
1164 bool pty_fill (); 1183 bool pty_fill ();
1165 1184
1166 void make_current () const // make this the "currently active" urxvt instance 1185 void make_current () const // make this the "currently active" urxvt instance
1167 { 1186 {
1168 SET_R (this); 1187 SET_R (this);
1188 set_environ (envv);
1169 rxvt_set_locale (locale); 1189 rxvt_set_locale (locale);
1170 set_environ (envv);
1171 } 1190 }
1172 1191
1173 void init_secondary (); 1192 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv); 1193 const char **init_resources (int argc, const char *const *argv);
1175 const char *x_resource (const char *name); 1194 const char *x_resource (const char *name);
… …
1200 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1219 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1201 1220
1202 bool IMisRunning (); 1221 bool IMisRunning ();
1203 void IMSendSpot (); 1222 void IMSendSpot ();
1204 bool IM_get_IC (const char *modifiers); 1223 bool IM_get_IC (const char *modifiers);
1205 void IMSetStatusPosition (); 1224 void IMSetPosition ();
1206#endif 1225#endif
1207 1226
1208 void resize_scrollbar (); 1227 void resize_scrollbar ();
1209 1228
1210 // command.C 1229 // command.C
1211 void lookup_key (XKeyEvent &ev); 1230 void key_press (XKeyEvent &ev);
1231 void key_release (XKeyEvent &ev);
1212 unsigned int cmd_write (const char *str, unsigned int count); 1232 unsigned int cmd_write (const char *str, unsigned int count);
1213 1233
1214 wchar_t next_char () NOTHROW; 1234 wchar_t next_char () NOTHROW;
1215 wchar_t cmd_getc () THROW ((class out_of_input)); 1235 wchar_t cmd_getc () THROW ((class out_of_input));
1216 uint32_t next_octet () NOTHROW; 1236 uint32_t next_octet () NOTHROW;
… …
1220 void mouse_report (XButtonEvent &ev); 1240 void mouse_report (XButtonEvent &ev);
1221 void button_press (XButtonEvent &ev); 1241 void button_press (XButtonEvent &ev);
1222 void button_release (XButtonEvent &ev); 1242 void button_release (XButtonEvent &ev);
1223 void focus_in (); 1243 void focus_in ();
1224 void focus_out (); 1244 void focus_out ();
1225 int check_our_parents (); 1245 void update_fade_color (unsigned int idx);
1226#ifdef PRINTPIPE 1246#ifdef PRINTPIPE
1227 FILE *popen_printer (); 1247 FILE *popen_printer ();
1228 int pclose_printer (FILE *stream); 1248 int pclose_printer (FILE *stream);
1229#endif 1249#endif
1230 void process_print_pipe (); 1250 void process_print_pipe ();
… …
1252 void set_title (const char *str); 1272 void set_title (const char *str);
1253 void set_icon_name (const char *str); 1273 void set_icon_name (const char *str);
1254 void set_window_color (int idx, const char *color); 1274 void set_window_color (int idx, const char *color);
1255 void set_colorfgbg (); 1275 void set_colorfgbg ();
1256 bool set_color (rxvt_color &color, const char *name); 1276 bool set_color (rxvt_color &color, const char *name);
1277 void alias_color (int dst, int src);
1257 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1278 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1258 1279
1259 // screen.C 1280 // screen.C
1260 1281
1261 void lalloc (line_t &l) const 1282 void lalloc (line_t &l) const
… …
1290 { 1311 {
1291 int base = GET_BASEFG (r); 1312 int base = GET_BASEFG (r);
1292#ifndef NO_BRIGHTCOLOR 1313#ifndef NO_BRIGHTCOLOR
1293 if (r & RS_Bold 1314 if (r & RS_Bold
1294# if ENABLE_STYLES 1315# if ENABLE_STYLES
1295 && OPTION (Opt_intensityStyles) 1316 && option (Opt_intensityStyles)
1296# endif 1317# endif
1297 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1298 base += minBrightCOLOR - minCOLOR; 1319 base += minBrightCOLOR - minCOLOR;
1299#endif 1320#endif
1300 return base; 1321 return base;
… …
1304 { 1325 {
1305 int base = GET_BASEBG (r); 1326 int base = GET_BASEBG (r);
1306#ifndef NO_BRIGHTCOLOR 1327#ifndef NO_BRIGHTCOLOR
1307 if (r & RS_Blink 1328 if (r & RS_Blink
1308# if ENABLE_STYLES 1329# if ENABLE_STYLES
1309 && OPTION (Opt_intensityStyles) 1330 && option (Opt_intensityStyles)
1310# endif 1331# endif
1311 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1332 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1312 base += minBrightCOLOR - minCOLOR; 1333 base += minBrightCOLOR - minCOLOR;
1313#endif 1334#endif
1314 return base; 1335 return base;
1315 } 1336 }
1316 1337
1317 bool option (uint32_t opt) const NOTHROW 1338 bool option (uint8_t opt) const NOTHROW
1318 { 1339 {
1319 return OPTION (opt); 1340 return options[opt >> 3] & (1 << (opt & 7));
1320 } 1341 }
1321 1342
1322 void set_option (uint32_t opt, bool set) NOTHROW 1343 void set_option (uint8_t opt, bool set = true) NOTHROW
1323 { 1344 {
1324 if (set) 1345 if (set)
1325 options |= opt; 1346 options[opt >> 3] |= (1 << (opt & 7));
1326 else 1347 else
1327 options &= ~opt; 1348 options[opt >> 3] &= ~(1 << (opt & 7));
1328 } 1349 }
1329 1350
1330 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1351 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; 1352 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; 1353 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1438 void get_options (int argc, const char *const *argv); 1459 void get_options (int argc, const char *const *argv);
1439 int parse_keysym (const char *str, const char *arg); 1460 int parse_keysym (const char *str, const char *arg);
1440 void get_xdefaults (FILE *stream, const char *name); 1461 void get_xdefaults (FILE *stream, const char *name);
1441 void extract_resources (); 1462 void extract_resources ();
1442 // xpm.C 1463 // xpm.C
1443 int scale_pixmap (const char *geom); 1464//int scale_pixmap (const char *geom);
1444 void resize_pixmap (); 1465 void resize_pixmap ();
1445 Pixmap set_bgPixmap (const char *file); 1466 void set_bgPixmap (const char *file);
1446}; 1467};
1447 1468
1448/* 1469/*
1449 ***************************************************************************** 1470 *****************************************************************************
1450 * PROTOTYPES 1471 * PROTOTYPES

Diff Legend

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