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.124 by root, Sun Sep 5 09:54:28 2004 UTC vs.
Revision 1.148 by root, Thu Feb 17 12:06:21 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"
… …
80/* 80/*
81 ***************************************************************************** 81 *****************************************************************************
82 * PROTOTYPES 82 * PROTOTYPES
83 ***************************************************************************** 83 *****************************************************************************
84 */ 84 */
85// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 86RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 87RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 88void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 89void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 90void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 91void * rxvt_realloc (void *ptr, size_t size);
92void rxvt_privileges (rxvt_privaction action);
93
94// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len); 95char * rxvt_wcstombs (const wchar_t *str, int len = -1);
96wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
97char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
98wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
92char * rxvt_strdup (const char *str); 99char * rxvt_strdup (const char *str);
100
101// misc.C
93char * rxvt_r_basename (const char *str); 102char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr); 103void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...); 104void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...); 105void rxvt_warn (const char *fmt,...);
97void rxvt_fatal (const char *fmt,...); 106void rxvt_fatal (const char *fmt,...);
… …
99int rxvt_Str_match (const char *s1, const char *s2); 108int rxvt_Str_match (const char *s1, const char *s2);
100const char * rxvt_Str_skip_space (const char *str); 109const char * rxvt_Str_skip_space (const char *str);
101char * rxvt_Str_trim (char *str); 110char * rxvt_Str_trim (char *str);
102int rxvt_Str_escaped (char *str); 111int rxvt_Str_escaped (char *str);
103char ** rxvt_splitcommastring (const char *cs); 112char ** rxvt_splitcommastring (const char *cs);
113void rxvt_freecommastring (char **cs);
104char * rxvt_File_find (const char *file, const char *ext, const char *path); 114char * 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); 115void 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); 116void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
107
108void rxvt_privileges (rxvt_privaction action);
109 117
110/* 118/*
111 ***************************************************************************** 119 *****************************************************************************
112 * STRUCTURES AND TYPEDEFS 120 * STRUCTURES AND TYPEDEFS
113 ***************************************************************************** 121 *****************************************************************************
… …
131# undef KEEP_SCROLLCOLOR 139# undef KEEP_SCROLLCOLOR
132#endif 140#endif
133 141
134#ifdef XPM_BACKGROUND 142#ifdef XPM_BACKGROUND
135typedef struct { 143typedef struct {
136 short w, h, x, y; 144 short w, h, x, y;
137 Pixmap pixmap; 145 Pixmap pixmap;
138} bgPixmap_t; 146} bgPixmap_t;
139#endif 147#endif
140 148
141/* 149/*
142 * the 'essential' information for reporting Mouse Events 150 * the 'essential' information for reporting Mouse Events
143 * pared down from XButtonEvent 151 * pared down from XButtonEvent
144 */ 152 */
145struct mouse_event { 153struct mouse_event {
146 int clicks; 154 int clicks;
147 Time time; /* milliseconds */ 155 Time time; /* milliseconds */
148 unsigned int state; /* key or button mask */ 156 unsigned int state; /* key or button mask */
149 unsigned int button; /* detail */ 157 unsigned int button; /* detail */
150}; 158};
151 159
152#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 160#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
153#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 161#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
154#define SWAP_IT(one, two, typeof) \ 162#define SWAP_IT(one, two, typeof) \
… …
496 Color_BD, 504 Color_BD,
497 Color_IT, 505 Color_IT,
498 Color_UL, 506 Color_UL,
499 Color_RV, 507 Color_RV,
500#endif 508#endif
509#if ENABLE_FRILLS
510 Color_underline,
511#endif
501#ifdef OPTION_HC 512#ifdef OPTION_HC
502 Color_HC, 513 Color_HC,
503#endif 514#endif
504#ifdef KEEP_SCROLLCOLOR 515#ifdef KEEP_SCROLLCOLOR
505 Color_scroll, 516 Color_scroll,
… …
556#ifdef HAVE_SCROLLBARS 567#ifdef HAVE_SCROLLBARS
557 Rs_scrollBar, 568 Rs_scrollBar,
558 Rs_scrollBar_right, 569 Rs_scrollBar_right,
559 Rs_scrollBar_floating, 570 Rs_scrollBar_floating,
560 Rs_scrollBar_align, 571 Rs_scrollBar_align,
561#endif
562 Rs_scrollstyle, /* Rs_scrollBar_style */ 572 Rs_scrollstyle, /* Rs_scrollBar_style */
573 Rs_scrollBar_thickness,
574#endif
563 Rs_scrollTtyOutput, 575 Rs_scrollTtyOutput,
564 Rs_scrollTtyKeypress, 576 Rs_scrollTtyKeypress,
565 Rs_scrollWithBuffer, 577 Rs_scrollWithBuffer,
566 Rs_saveLines, 578 Rs_saveLines,
567 Rs_utmpInhibit, 579 Rs_utmpInhibit,
… …
595#endif 607#endif
596#if ENABLE_FRILLS 608#if ENABLE_FRILLS
597 Rs_ext_bwidth, 609 Rs_ext_bwidth,
598 Rs_int_bwidth, 610 Rs_int_bwidth,
599 Rs_borderLess, 611 Rs_borderLess,
600#endif
601 Rs_scrollBar_thickness,
602#ifndef NO_LINESPACE
603 Rs_lineSpace, 612 Rs_lineSpace,
613 Rs_embed,
604#endif 614#endif
605 Rs_cutchars, 615 Rs_cutchars,
606 Rs_modifier, 616 Rs_modifier,
607 Rs_answerbackstring, 617 Rs_answerbackstring,
608 Rs_tripleclickwords, 618 Rs_tripleclickwords,
609 Rs_insecure, 619 Rs_insecure,
610 Rs_cursorBlink, 620 Rs_cursorBlink,
611 Rs_pointerBlank, 621 Rs_pointerBlank,
612 Rs_pointerBlankDelay, 622 Rs_pointerBlankDelay,
613 Rs_imLocale, 623 Rs_imLocale,
624 Rs_imFont,
625 Rs_pastableTabs,
614#ifndef NO_SECONDARY_SCREEN 626#ifndef NO_SECONDARY_SCREEN
615 Rs_secondaryScreen, 627 Rs_secondaryScreen,
616 Rs_secondaryScroll, 628 Rs_secondaryScroll,
617#endif 629#endif
618#ifdef OFF_FOCUS_FADING 630#ifdef OFF_FOCUS_FADING
… …
633 XA_TARGETS, 645 XA_TARGETS,
634 XA_TIMESTAMP, 646 XA_TIMESTAMP,
635 XA_VT_SELECTION, 647 XA_VT_SELECTION,
636 XA_INCR, 648 XA_INCR,
637 XA_WMDELETEWINDOW, 649 XA_WMDELETEWINDOW,
650 XA_CLIPBOARD,
651#if ENABLE_FRILLS
652 XA_NET_WM_PID,
653 XA_MOTIF_WM_HINTS,
654 XA_NET_WM_NAME,
655 XA_NET_WM_ICON_NAME,
656#endif
657#if USE_XIM
658 XA_WM_LOCALE_NAME,
659#endif
638#ifdef TRANSPARENT 660#if TRANSPARENT
639 XA_XROOTPMAPID, 661 XA_XROOTPMAP_ID,
640 XA_XSETROOTID, 662 XA_ESETROOT_PMAP_ID,
641#endif 663#endif
642#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 664#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
643 XA_DNDPROTOCOL, 665 XA_DNDPROTOCOL,
644 XA_DNDSELECTION, 666 XA_DNDSELECTION,
645#endif /* OFFIX_DND */ 667#endif
646 XA_CLIPBOARD,
647 NUM_XA 668 NUM_XA
648}; 669};
649 670
650/* DEC private modes */ 671/* DEC private modes */
651#define PrivMode_132 (1UL<<0) 672#define PrivMode_132 (1UL<<0)
… …
678 priv_modes |= (bit); \ 699 priv_modes |= (bit); \
679 else \ 700 else \
680 priv_modes &= ~(bit) 701 priv_modes &= ~(bit)
681 702
682#ifdef ALLOW_132_MODE 703#ifdef ALLOW_132_MODE
683# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 704# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
684#else 705#else
685# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 706# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
686#endif 707#endif
687 708
688// do not change these constants lightly, there are many interdependencies 709// do not change these constants lightly, there are many interdependencies
689#define IMBUFSIZ 128 // input modifier buffer sizes 710#define IMBUFSIZ 128 // input modifier buffer sizes
690#define KBUFSZ 512 // size of keyboard mapping buffer 711#define KBUFSZ 512 // size of keyboard mapping buffer
… …
741#define strdup(x) strdup((const char *)(x)) 762#define strdup(x) strdup((const char *)(x))
742#define strlen(x) strlen((const char *)(x)) 763#define strlen(x) strlen((const char *)(x))
743#define strchr(x, y) strchr((const char *)(x), (int)(y)) 764#define strchr(x, y) strchr((const char *)(x), (int)(y))
744#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 765#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
745 766
767#define dDisp Display *disp = display->display
768
746/* convert pixel dimensions to row/column values. Everything as int32_t */ 769/* convert pixel dimensions to row/column values. Everything as int32_t */
747#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 770#define Pixel2Col(x) Pixel2Width((int32_t)(x))
748#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 771#define Pixel2Row(y) Pixel2Height((int32_t)(y))
749#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 772#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
750#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 773#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)) 871# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
849#else 872#else
850# define XPMClearArea(a, b, c, d, e, f, g) 873# define XPMClearArea(a, b, c, d, e, f, g)
851#endif 874#endif
852 875
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 876#ifdef UTMP_SUPPORT
861# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 877# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
862# undef HAVE_UTMPX_H 878# undef HAVE_UTMPX_H
863# undef HAVE_STRUCT_UTMPX 879# undef HAVE_STRUCT_UTMPX
864# endif 880# endif
… …
936 952
937 operator mbstate_t *() { return &mbs; } 953 operator mbstate_t *() { return &mbs; }
938 void reset () { memset (&mbs, 0, sizeof (mbs)); } 954 void reset () { memset (&mbs, 0, sizeof (mbs)); }
939 mbstate () { reset (); } 955 mbstate () { reset (); }
940}; 956};
957
958#define UNICODE_MASK 0x1fffffUL
941 959
942#if UNICODE3 960#if UNICODE3
943# define COMPOSE_LO 0x40000000UL 961# define COMPOSE_LO 0x40000000UL
944# define COMPOSE_HI 0x400fffffUL 962# define COMPOSE_HI 0x400fffffUL
945# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 963# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
975 993
976extern class rxvt_composite_vec rxvt_composite; 994extern class rxvt_composite_vec rxvt_composite;
977#endif 995#endif
978 996
979 997
998#ifdef KEYSYM_RESOURCE
999 class keyboard_manager;
1000#endif
1001
980struct rxvt_term : zero_initialized, rxvt_vars { 1002struct rxvt_term : zero_initialized, rxvt_vars {
981 log_callback *log_hook; // log error messages through this hook, if != 0 1003 log_callback *log_hook; // log error messages through this hook, if != 0
982 1004
983 struct mbstate mbstate; // current input multibyte state 1005 struct mbstate mbstate; // current input multibyte state
984 1006
… …
1001 hidden_text:1, 1023 hidden_text:1,
1002#endif 1024#endif
1003#ifdef POINTER_BLANK 1025#ifdef POINTER_BLANK
1004 hidden_pointer:1, 1026 hidden_pointer:1,
1005#endif 1027#endif
1006// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1028 enc_utf8:1, /* wether locale uses utf-8 */
1007 seen_input:1, /* wether we have seen some program output yet */ 1029 seen_input:1, /* wether we have seen some program output yet */
1008 seen_resize:1, /* wether we had a resize event */ 1030 seen_resize:1, /* wether we had a resize event */
1009 parsed_geometry:1; 1031 parsed_geometry:1;
1010 1032
1011 unsigned char refresh_type, 1033 unsigned char refresh_type,
… …
1057# ifdef POINTER_BLANK 1079# ifdef POINTER_BLANK
1058 pointerBlankDelay, 1080 pointerBlankDelay,
1059# endif 1081# endif
1060 allowedxerror; 1082 allowedxerror;
1061/* ---------- */ 1083/* ---------- */
1062 unsigned int ModMetaMask, 1084 unsigned int ModLevel3Mask,
1085 ModMetaMask,
1063 ModNumLockMask; 1086 ModNumLockMask;
1064 int old_width, /* last used width in screen resize */ 1087 int old_width, /* last used width in screen resize */
1065 old_height; /* last used height in screen resize */ 1088 old_height; /* last used height in screen resize */
1066 unsigned long priv_modes, 1089 unsigned long priv_modes,
1067 SavedModes; 1090 SavedModes;
… …
1097#endif 1120#endif
1098/* ---------- */ 1121/* ---------- */
1099 Time selection_time, 1122 Time selection_time,
1100 selection_request_time; 1123 selection_request_time;
1101 pid_t cmd_pid; /* process id of child */ 1124 pid_t cmd_pid; /* process id of child */
1125 char * incr_buf;
1126 size_t incr_buf_size, incr_buf_fill;
1102/* ---------- */ 1127/* ---------- */
1103 Cursor leftptr_cursor; 1128 Cursor leftptr_cursor;
1104#ifdef POINTER_BLANK
1105 Cursor blank_cursor;
1106#endif
1107/* ---------- */ 1129/* ---------- */
1108#ifndef NO_BACKSPACE_KEY 1130#ifndef NO_BACKSPACE_KEY
1109 const char *key_backspace; 1131 const char *key_backspace;
1110#endif 1132#endif
1111#ifndef NO_DELETE_KEY 1133#ifndef NO_DELETE_KEY
… …
1165 char *env_windowid; /* environmental variable WINDOWID */ 1187 char *env_windowid; /* environmental variable WINDOWID */
1166 char *env_display; /* environmental variable DISPLAY */ 1188 char *env_display; /* environmental variable DISPLAY */
1167 char *env_term; /* environmental variable TERM */ 1189 char *env_term; /* environmental variable TERM */
1168 char *env_colorfgbg; 1190 char *env_colorfgbg;
1169 char *locale; 1191 char *locale;
1170#if 0
1171 char *codeset;
1172#endif
1173 char charsets[4]; 1192 char charsets[4];
1174 unsigned char *v_buffer; /* pointer to physical buffer */ 1193 unsigned char *v_buffer; /* pointer to physical buffer */
1175 unsigned int v_buflen; /* size of area to write */ 1194 unsigned int v_buflen; /* size of area to write */
1176 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1195 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1196
1177#ifdef KEYSYM_RESOURCE 1197#ifdef KEYSYM_RESOURCE
1178 const unsigned char *Keysym_map[256]; 1198 keyboard_manager *keyboard;
1179#endif 1199#endif
1200
1180 const char *rs[NUM_RESOURCES]; 1201 const char *rs[NUM_RESOURCES];
1181 /* command input buffering */ 1202 /* command input buffering */
1182 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1203 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1183 unsigned char cmdbuf_base[CBUFSIZ]; 1204 unsigned char cmdbuf_base[CBUFSIZ];
1184 1205
… …
1196 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1217 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1197 void iso14755_54 (int x, int y); 1218 void iso14755_54 (int x, int y);
1198# endif 1219# endif
1199#endif 1220#endif
1200 1221
1222 // modifies first argument(!)
1201 void paste (const unsigned char *data, unsigned int len); 1223 void paste (unsigned char *data, unsigned int len);
1202 1224
1203 void flush (); 1225 void flush ();
1204 1226
1205#if TRANSPARENT 1227#if TRANSPARENT
1206 void rootwin_cb (XEvent &xev); 1228 void rootwin_cb (XEvent &xev);
1207 xevent_watcher rootwin_ev; 1229 xevent_watcher rootwin_ev;
1208#endif 1230#endif
1209 1231
1210 1232
1211 void sig_term (sig_watcher &w); sig_watcher sw_term; 1233 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1212 void sig_chld (sig_watcher &w); sig_watcher sw_chld; 1234 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1213 1235
1214 void x_cb (XEvent &xev); 1236 void x_cb (XEvent &xev);
1215 xevent_watcher termwin_ev; 1237 xevent_watcher termwin_ev;
1216 xevent_watcher vt_ev; 1238 xevent_watcher vt_ev;
… …
1252#endif 1274#endif
1253 void pointer_unblank (); 1275 void pointer_unblank ();
1254 1276
1255 void tt_printf (const char *fmt,...); 1277 void tt_printf (const char *fmt,...);
1256 void tt_write (const unsigned char *data, unsigned int len); 1278 void tt_write (const unsigned char *data, unsigned int len);
1279 void pty_write ();
1257 1280
1258 void tt_winch (); 1281 void tt_winch ();
1259 1282
1260 rxvt_term (); 1283 rxvt_term ();
1261 ~rxvt_term (); 1284 ~rxvt_term ();
1262 void destroy (); 1285 void destroy ();
1286 void emergency_cleanup ();
1263 1287
1264 bool init (int argc, const char *const *argv); 1288 bool init (int argc, const char *const *argv);
1265 bool init_vars (); 1289 bool init_vars ();
1266 1290
1267 bool pty_fill (); 1291 bool pty_fill ();
… …
1350 void makeutent (const char *pty, const char *hostname); 1374 void makeutent (const char *pty, const char *hostname);
1351 void cleanutent (); 1375 void cleanutent ();
1352 // main.C 1376 // main.C
1353 void privileged_utmp (rxvt_privaction action); 1377 void privileged_utmp (rxvt_privaction action);
1354 bool set_fonts (); 1378 bool set_fonts ();
1379 void set_string_property (Atom prop, const char *str, int len = -1);
1380 void set_utf8_property (Atom prop, const char *str, int len = -1);
1355 void set_title (const char *str); 1381 void set_title (const char *str);
1356 void set_icon_name (const char *str); 1382 void set_icon_name (const char *str);
1357 void set_window_color (int idx, const char *color); 1383 void set_window_color (int idx, const char *color);
1358 void set_colorfgbg (); 1384 void set_colorfgbg ();
1359 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1385 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1444 void scr_bell (); 1470 void scr_bell ();
1445 void scr_printscreen (int fullhist); 1471 void scr_printscreen (int fullhist);
1446 void scr_reverse_selection (); 1472 void scr_reverse_selection ();
1447 void scr_dump (int fd); 1473 void scr_dump (int fd);
1448 void selection_check (int check_more); 1474 void selection_check (int check_more);
1449 int selection_paste (Window win, Atom prop, bool delete_prop); 1475 void selection_paste (Window win, Atom prop, bool delete_prop);
1450 void selection_property (Window win, Atom prop); 1476 void selection_property (Window win, Atom prop);
1451 void selection_request (Time tm, int x, int y); 1477 void selection_request (Time tm, int x, int y);
1452 int selection_request_other (Atom target, int selnum); 1478 int selection_request_other (Atom target, int selnum);
1453 void selection_clear (); 1479 void selection_clear ();
1454 void selection_make (Time tm); 1480 void selection_make (Time tm);
… …
1489 1515
1490 // xdefaults.C 1516 // xdefaults.C
1491 void get_options (int argc, const char *const *argv); 1517 void get_options (int argc, const char *const *argv);
1492 int parse_keysym (const char *str, const char *arg); 1518 int parse_keysym (const char *str, const char *arg);
1493 void get_xdefaults (FILE *stream, const char *name); 1519 void get_xdefaults (FILE *stream, const char *name);
1494 void extract_resources (Display *display, const char *name); 1520 void extract_resources ();
1495 // xpm.C 1521 // xpm.C
1496 int scale_pixmap (const char *geom); 1522 int scale_pixmap (const char *geom);
1497 void resize_pixmap (); 1523 void resize_pixmap ();
1498 Pixmap set_bgPixmap (const char *file); 1524 Pixmap set_bgPixmap (const char *file);
1499}; 1525};

Diff Legend

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