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.121 by root, Wed Aug 25 03:52:09 2004 UTC vs.
Revision 1.145 by root, Fri Feb 4 11:41:23 2005 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
… …
86RETSIGTYPE rxvt_Exit_signal (int sig); 86RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 87void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 88void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 89void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 90void * rxvt_realloc (void *ptr, size_t size);
91char * rxvt_wcstombs (const wchar_t *str, int len); 91char * rxvt_wcstombs (const wchar_t *str, int len = -1);
92wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
93char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
94wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
92char * rxvt_strdup (const char *str); 95char * rxvt_strdup (const char *str);
93char * rxvt_r_basename (const char *str); 96char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr); 97void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...); 98void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...); 99void rxvt_warn (const char *fmt,...);
… …
99int rxvt_Str_match (const char *s1, const char *s2); 102int rxvt_Str_match (const char *s1, const char *s2);
100const char * rxvt_Str_skip_space (const char *str); 103const char * rxvt_Str_skip_space (const char *str);
101char * rxvt_Str_trim (char *str); 104char * rxvt_Str_trim (char *str);
102int rxvt_Str_escaped (char *str); 105int rxvt_Str_escaped (char *str);
103char ** rxvt_splitcommastring (const char *cs); 106char ** rxvt_splitcommastring (const char *cs);
107void rxvt_freecommastring (char **cs);
104char * rxvt_File_find (const char *file, const char *ext, const char *path); 108char * rxvt_File_find (const char *file, const char *ext, const char *path);
105void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 109void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
106void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 110void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
107 111
108void rxvt_privileges (rxvt_privaction action); 112void rxvt_privileges (rxvt_privaction action);
… …
131# undef KEEP_SCROLLCOLOR 135# undef KEEP_SCROLLCOLOR
132#endif 136#endif
133 137
134#ifdef XPM_BACKGROUND 138#ifdef XPM_BACKGROUND
135typedef struct { 139typedef struct {
136 short w, h, x, y; 140 short w, h, x, y;
137 Pixmap pixmap; 141 Pixmap pixmap;
138} bgPixmap_t; 142} bgPixmap_t;
139#endif 143#endif
140 144
141/* 145/*
142 * the 'essential' information for reporting Mouse Events 146 * the 'essential' information for reporting Mouse Events
143 * pared down from XButtonEvent 147 * pared down from XButtonEvent
144 */ 148 */
145struct mouse_event { 149struct mouse_event {
146 int clicks; 150 int clicks;
147 Time time; /* milliseconds */ 151 Time time; /* milliseconds */
148 unsigned int state; /* key or button mask */ 152 unsigned int state; /* key or button mask */
149 unsigned int button; /* detail */ 153 unsigned int button; /* detail */
150}; 154};
151 155
152#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 156#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
153#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 157#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
154#define SWAP_IT(one, two, typeof) \ 158#define SWAP_IT(one, two, typeof) \
… …
496 Color_BD, 500 Color_BD,
497 Color_IT, 501 Color_IT,
498 Color_UL, 502 Color_UL,
499 Color_RV, 503 Color_RV,
500#endif 504#endif
505#if ENABLE_FRILLS
506 Color_underline,
507#endif
501#ifdef OPTION_HC 508#ifdef OPTION_HC
502 Color_HC, 509 Color_HC,
503#endif 510#endif
504#ifdef KEEP_SCROLLCOLOR 511#ifdef KEEP_SCROLLCOLOR
505 Color_scroll, 512 Color_scroll,
… …
556#ifdef HAVE_SCROLLBARS 563#ifdef HAVE_SCROLLBARS
557 Rs_scrollBar, 564 Rs_scrollBar,
558 Rs_scrollBar_right, 565 Rs_scrollBar_right,
559 Rs_scrollBar_floating, 566 Rs_scrollBar_floating,
560 Rs_scrollBar_align, 567 Rs_scrollBar_align,
561#endif
562 Rs_scrollstyle, /* Rs_scrollBar_style */ 568 Rs_scrollstyle, /* Rs_scrollBar_style */
569 Rs_scrollBar_thickness,
570#endif
563 Rs_scrollTtyOutput, 571 Rs_scrollTtyOutput,
564 Rs_scrollTtyKeypress, 572 Rs_scrollTtyKeypress,
565 Rs_scrollWithBuffer, 573 Rs_scrollWithBuffer,
566 Rs_saveLines, 574 Rs_saveLines,
567 Rs_utmpInhibit, 575 Rs_utmpInhibit,
… …
596#if ENABLE_FRILLS 604#if ENABLE_FRILLS
597 Rs_ext_bwidth, 605 Rs_ext_bwidth,
598 Rs_int_bwidth, 606 Rs_int_bwidth,
599 Rs_borderLess, 607 Rs_borderLess,
600#endif 608#endif
601 Rs_scrollBar_thickness, 609#if ENABLE_FRILLS
602#ifndef NO_LINESPACE
603 Rs_lineSpace, 610 Rs_lineSpace,
604#endif 611#endif
605 Rs_cutchars, 612 Rs_cutchars,
606 Rs_modifier, 613 Rs_modifier,
607 Rs_answerbackstring, 614 Rs_answerbackstring,
… …
609 Rs_insecure, 616 Rs_insecure,
610 Rs_cursorBlink, 617 Rs_cursorBlink,
611 Rs_pointerBlank, 618 Rs_pointerBlank,
612 Rs_pointerBlankDelay, 619 Rs_pointerBlankDelay,
613 Rs_imLocale, 620 Rs_imLocale,
621 Rs_imFont,
622 Rs_pastableTabs,
614#ifndef NO_SECONDARY_SCREEN 623#ifndef NO_SECONDARY_SCREEN
615 Rs_secondaryScreen, 624 Rs_secondaryScreen,
616 Rs_secondaryScroll, 625 Rs_secondaryScroll,
617#endif 626#endif
618#ifdef OFF_FOCUS_FADING 627#ifdef OFF_FOCUS_FADING
… …
633 XA_TARGETS, 642 XA_TARGETS,
634 XA_TIMESTAMP, 643 XA_TIMESTAMP,
635 XA_VT_SELECTION, 644 XA_VT_SELECTION,
636 XA_INCR, 645 XA_INCR,
637 XA_WMDELETEWINDOW, 646 XA_WMDELETEWINDOW,
647 XA_CLIPBOARD,
648#if ENABLE_FRILLS
649 XA_NET_WM_PID,
650 XA_MOTIF_WM_HINTS,
651 XA_NET_WM_NAME,
652 XA_NET_WM_ICON_NAME,
653#endif
654#if USE_XIM
655 XA_WM_LOCALE_NAME,
656#endif
638#ifdef TRANSPARENT 657#if TRANSPARENT
639 XA_XROOTPMAPID, 658 XA_XROOTPMAP_ID,
640 XA_XSETROOTID, 659 XA_ESETROOT_PMAP_ID,
641#endif 660#endif
642#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 661#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
643 XA_DNDPROTOCOL, 662 XA_DNDPROTOCOL,
644 XA_DNDSELECTION, 663 XA_DNDSELECTION,
645#endif /* OFFIX_DND */ 664#endif
646 XA_CLIPBOARD,
647 NUM_XA 665 NUM_XA
648}; 666};
649 667
650/* DEC private modes */ 668/* DEC private modes */
651#define PrivMode_132 (1UL<<0) 669#define PrivMode_132 (1UL<<0)
… …
741#define strdup(x) strdup((const char *)(x)) 759#define strdup(x) strdup((const char *)(x))
742#define strlen(x) strlen((const char *)(x)) 760#define strlen(x) strlen((const char *)(x))
743#define strchr(x, y) strchr((const char *)(x), (int)(y)) 761#define strchr(x, y) strchr((const char *)(x), (int)(y))
744#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 762#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
745 763
764#define dDisp Display *disp = display->display
765
746/* convert pixel dimensions to row/column values. Everything as int32_t */ 766/* convert pixel dimensions to row/column values. Everything as int32_t */
747#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 767#define Pixel2Col(x) Pixel2Width((int32_t)(x))
748#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 768#define Pixel2Row(y) Pixel2Height((int32_t)(y))
749#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 769#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
750#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 770#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
… …
848# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 868# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
849#else 869#else
850# define XPMClearArea(a, b, c, d, e, f, g) 870# define XPMClearArea(a, b, c, d, e, f, g)
851#endif 871#endif
852 872
853#ifndef STRICT_FONT_CHECKING
854# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
855#endif
856
857#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
858#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
859
860#ifdef UTMP_SUPPORT 873#ifdef UTMP_SUPPORT
861# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 874# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
862# undef HAVE_UTMPX_H 875# undef HAVE_UTMPX_H
863# undef HAVE_STRUCT_UTMPX 876# undef HAVE_STRUCT_UTMPX
864# endif 877# endif
… …
936 949
937 operator mbstate_t *() { return &mbs; } 950 operator mbstate_t *() { return &mbs; }
938 void reset () { memset (&mbs, 0, sizeof (mbs)); } 951 void reset () { memset (&mbs, 0, sizeof (mbs)); }
939 mbstate () { reset (); } 952 mbstate () { reset (); }
940}; 953};
954
955#define UNICODE_MASK 0x1fffffUL
941 956
942#if UNICODE3 957#if UNICODE3
943# define COMPOSE_LO 0x40000000UL 958# define COMPOSE_LO 0x40000000UL
944# define COMPOSE_HI 0x400fffffUL 959# define COMPOSE_HI 0x400fffffUL
945# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 960# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
975 990
976extern class rxvt_composite_vec rxvt_composite; 991extern class rxvt_composite_vec rxvt_composite;
977#endif 992#endif
978 993
979 994
995#ifdef KEYSYM_RESOURCE
996 class keyboard_manager;
997#endif
998
980struct rxvt_term : zero_initialized, rxvt_vars { 999struct rxvt_term : zero_initialized, rxvt_vars {
981 log_callback *log_hook; // log error messages through this hook, if != 0 1000 log_callback *log_hook; // log error messages through this hook, if != 0
982 1001
983 struct mbstate mbstate; // current input multibyte state 1002 struct mbstate mbstate; // current input multibyte state
984 1003
… …
1001 hidden_text:1, 1020 hidden_text:1,
1002#endif 1021#endif
1003#ifdef POINTER_BLANK 1022#ifdef POINTER_BLANK
1004 hidden_pointer:1, 1023 hidden_pointer:1,
1005#endif 1024#endif
1006// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1025 enc_utf8:1, /* wether locale uses utf-8 */
1007 seen_input:1, /* wether we have seen some program output yet */ 1026 seen_input:1, /* wether we have seen some program output yet */
1008 seen_resize:1, /* wether we had a resize event */ 1027 seen_resize:1, /* wether we had a resize event */
1009 parsed_geometry:1; 1028 parsed_geometry:1;
1010 1029
1011 unsigned char refresh_type, 1030 unsigned char refresh_type,
… …
1015 scrollbar_align, 1034 scrollbar_align,
1016 selection_wait, 1035 selection_wait,
1017 selection_type; 1036 selection_type;
1018/* ---------- */ 1037/* ---------- */
1019 short rvideo; 1038 short rvideo;
1020 int16_t num_scr; /* screen: number lines scrolled */ 1039 int num_scr; /* screen: number lines scrolled */
1021 unsigned int prev_ncol, /* screen: previous number of columns */ 1040 int prev_ncol, /* screen: previous number of columns */
1022 prev_nrow; /* screen: previous number of rows */ 1041 prev_nrow; /* screen: previous number of rows */
1023/* ---------- */ 1042/* ---------- */
1024 rend_t rstyle; 1043 rend_t rstyle;
1025/* ---------- */ 1044/* ---------- */
1026 uint32_t pixcolor_set[NPIXCLR_SETS]; 1045 uint32_t pixcolor_set[NPIXCLR_SETS];
… …
1057# ifdef POINTER_BLANK 1076# ifdef POINTER_BLANK
1058 pointerBlankDelay, 1077 pointerBlankDelay,
1059# endif 1078# endif
1060 allowedxerror; 1079 allowedxerror;
1061/* ---------- */ 1080/* ---------- */
1062 unsigned int ModMetaMask, 1081 unsigned int ModLevel3Mask,
1082 ModMetaMask,
1063 ModNumLockMask, 1083 ModNumLockMask;
1064 old_width, /* last used width in screen resize */ 1084 int old_width, /* last used width in screen resize */
1065 old_height; /* last used height in screen resize */ 1085 old_height; /* last used height in screen resize */
1066 unsigned long priv_modes, 1086 unsigned long priv_modes,
1067 SavedModes; 1087 SavedModes;
1068/* ---------- */ 1088/* ---------- */
1069 Atom xa[NUM_XA]; 1089 Atom xa[NUM_XA];
… …
1097#endif 1117#endif
1098/* ---------- */ 1118/* ---------- */
1099 Time selection_time, 1119 Time selection_time,
1100 selection_request_time; 1120 selection_request_time;
1101 pid_t cmd_pid; /* process id of child */ 1121 pid_t cmd_pid; /* process id of child */
1122 char * incr_buf;
1123 size_t incr_buf_size, incr_buf_fill;
1102/* ---------- */ 1124/* ---------- */
1103 Cursor leftptr_cursor; 1125 Cursor leftptr_cursor;
1104#ifdef POINTER_BLANK
1105 Cursor blank_cursor;
1106#endif
1107/* ---------- */ 1126/* ---------- */
1108#ifndef NO_BACKSPACE_KEY 1127#ifndef NO_BACKSPACE_KEY
1109 const char *key_backspace; 1128 const char *key_backspace;
1110#endif 1129#endif
1111#ifndef NO_DELETE_KEY 1130#ifndef NO_DELETE_KEY
1112 const char *key_delete; 1131 const char *key_delete;
1113#endif
1114#ifdef USE_XIM
1115 rxvt_xim *input_method;
1116 XIC Input_Context;
1117 XIMStyle input_style;
1118#endif 1132#endif
1119 struct mouse_event MEvent; 1133 struct mouse_event MEvent;
1120 XComposeStatus compose; 1134 XComposeStatus compose;
1121 ttymode_t tio; 1135 ttymode_t tio;
1122#ifdef UTMP_SUPPORT 1136#ifdef UTMP_SUPPORT
… …
1170 char *env_windowid; /* environmental variable WINDOWID */ 1184 char *env_windowid; /* environmental variable WINDOWID */
1171 char *env_display; /* environmental variable DISPLAY */ 1185 char *env_display; /* environmental variable DISPLAY */
1172 char *env_term; /* environmental variable TERM */ 1186 char *env_term; /* environmental variable TERM */
1173 char *env_colorfgbg; 1187 char *env_colorfgbg;
1174 char *locale; 1188 char *locale;
1175#if 0
1176 char *codeset;
1177#endif
1178 char charsets[4]; 1189 char charsets[4];
1179 unsigned char *v_buffer; /* pointer to physical buffer */ 1190 unsigned char *v_buffer; /* pointer to physical buffer */
1180 unsigned int v_buflen; /* size of area to write */ 1191 unsigned int v_buflen; /* size of area to write */
1181 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1192 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1193
1182#ifdef KEYSYM_RESOURCE 1194#ifdef KEYSYM_RESOURCE
1183 const unsigned char *Keysym_map[256]; 1195 keyboard_manager *keyboard;
1184#endif 1196#endif
1197
1185 const char *rs[NUM_RESOURCES]; 1198 const char *rs[NUM_RESOURCES];
1186 /* command input buffering */ 1199 /* command input buffering */
1187 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1200 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1188 unsigned char cmdbuf_base[CBUFSIZ]; 1201 unsigned char cmdbuf_base[CBUFSIZ];
1189 1202
… …
1201 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1214 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1202 void iso14755_54 (int x, int y); 1215 void iso14755_54 (int x, int y);
1203# endif 1216# endif
1204#endif 1217#endif
1205 1218
1219 // modifies first argument(!)
1206 void paste (const unsigned char *data, unsigned int len); 1220 void paste (unsigned char *data, unsigned int len);
1207 1221
1208 void flush (); 1222 void flush ();
1209 1223
1210#if TRANSPARENT 1224#if TRANSPARENT
1211 void rootwin_cb (XEvent &xev); 1225 void rootwin_cb (XEvent &xev);
1212 xevent_watcher rootwin_ev; 1226 xevent_watcher rootwin_ev;
1213#endif 1227#endif
1228
1229
1230 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1231 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1214 1232
1215 void x_cb (XEvent &xev); 1233 void x_cb (XEvent &xev);
1216 xevent_watcher termwin_ev; 1234 xevent_watcher termwin_ev;
1217 xevent_watcher vt_ev; 1235 xevent_watcher vt_ev;
1218#ifdef HAVE_SCROLLBARS 1236#ifdef HAVE_SCROLLBARS
… …
1253#endif 1271#endif
1254 void pointer_unblank (); 1272 void pointer_unblank ();
1255 1273
1256 void tt_printf (const char *fmt,...); 1274 void tt_printf (const char *fmt,...);
1257 void tt_write (const unsigned char *data, unsigned int len); 1275 void tt_write (const unsigned char *data, unsigned int len);
1276 void pty_write ();
1258 1277
1259 void tt_winch (); 1278 void tt_winch ();
1260 1279
1261 rxvt_term (); 1280 rxvt_term ();
1262 ~rxvt_term (); 1281 ~rxvt_term ();
1263 void destroy (); 1282 void destroy ();
1283 void emergency_cleanup ();
1264 1284
1265 bool init (int argc, const char *const *argv); 1285 bool init (int argc, const char *const *argv);
1266 bool init_vars (); 1286 bool init_vars ();
1267 1287
1268 bool pty_fill (); 1288 bool pty_fill ();
… …
1273 void set_locale (const char *locale); 1293 void set_locale (const char *locale);
1274 void init_xlocale (); 1294 void init_xlocale ();
1275 void init_command (const char *const *argv); 1295 void init_command (const char *const *argv);
1276 void run_command (const char *const *argv); 1296 void run_command (const char *const *argv);
1277 int run_child (const char *const *argv); 1297 int run_child (const char *const *argv);
1278 static void child_exited (int pid);
1279 1298
1280 void color_aliases (int idx); 1299 void color_aliases (int idx);
1281 void recolour_cursor (); 1300 void recolour_cursor ();
1282 void create_windows (int argc, const char *const *argv); 1301 void create_windows (int argc, const char *const *argv);
1283 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1302 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent);
1284 void window_calc (unsigned int width, unsigned int height); 1303 void window_calc (unsigned int width, unsigned int height);
1285 1304
1286#if USE_XIM 1305#if USE_XIM
1306 rxvt_xim *input_method;
1307 XIC Input_Context;
1308 XIMStyle input_style;
1309 XPoint spot; // most recently sent spot position
1310
1287 void im_destroy (); 1311 void im_destroy ();
1288 void im_cb (); im_watcher im_ev; 1312 void im_cb (); im_watcher im_ev;
1289 void im_set_size (XRectangle &size); 1313 void im_set_size (XRectangle &size);
1290 void im_set_position (XPoint &pos); 1314 void im_set_position (XPoint &pos);
1291 void im_set_color (unsigned long &fg, unsigned long &bg); 1315 void im_set_color (unsigned long &fg, unsigned long &bg);
… …
1347 void makeutent (const char *pty, const char *hostname); 1371 void makeutent (const char *pty, const char *hostname);
1348 void cleanutent (); 1372 void cleanutent ();
1349 // main.C 1373 // main.C
1350 void privileged_utmp (rxvt_privaction action); 1374 void privileged_utmp (rxvt_privaction action);
1351 bool set_fonts (); 1375 bool set_fonts ();
1376 void set_string_property (Atom prop, const char *str, int len = -1);
1377 void set_utf8_property (Atom prop, const char *str, int len = -1);
1352 void set_title (const char *str); 1378 void set_title (const char *str);
1353 void set_icon_name (const char *str); 1379 void set_icon_name (const char *str);
1354 void set_window_color (int idx, const char *color); 1380 void set_window_color (int idx, const char *color);
1355 void set_colorfgbg (); 1381 void set_colorfgbg ();
1356 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1382 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1441 void scr_bell (); 1467 void scr_bell ();
1442 void scr_printscreen (int fullhist); 1468 void scr_printscreen (int fullhist);
1443 void scr_reverse_selection (); 1469 void scr_reverse_selection ();
1444 void scr_dump (int fd); 1470 void scr_dump (int fd);
1445 void selection_check (int check_more); 1471 void selection_check (int check_more);
1446 int selection_paste (Window win, Atom prop, bool delete_prop); 1472 void selection_paste (Window win, Atom prop, bool delete_prop);
1447 void selection_property (Window win, Atom prop); 1473 void selection_property (Window win, Atom prop);
1448 void selection_request (Time tm, int x, int y); 1474 void selection_request (Time tm, int x, int y);
1449 int selection_request_other (Atom target, int selnum); 1475 int selection_request_other (Atom target, int selnum);
1450 void selection_clear (); 1476 void selection_clear ();
1451 void selection_make (Time tm); 1477 void selection_make (Time tm);
… …
1486 1512
1487 // xdefaults.C 1513 // xdefaults.C
1488 void get_options (int argc, const char *const *argv); 1514 void get_options (int argc, const char *const *argv);
1489 int parse_keysym (const char *str, const char *arg); 1515 int parse_keysym (const char *str, const char *arg);
1490 void get_xdefaults (FILE *stream, const char *name); 1516 void get_xdefaults (FILE *stream, const char *name);
1491 void extract_resources (Display *display, const char *name); 1517 void extract_resources ();
1492 // xpm.C 1518 // xpm.C
1493 int scale_pixmap (const char *geom); 1519 int scale_pixmap (const char *geom);
1494 void resize_pixmap (); 1520 void resize_pixmap ();
1495 Pixmap set_bgPixmap (const char *file); 1521 Pixmap set_bgPixmap (const char *file);
1496}; 1522};

Diff Legend

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