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.155 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.161 by root, Wed Nov 30 21:05:39 2005 UTC

… …
118char ** rxvt_splitcommastring (const char *cs); 118char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
120char * rxvt_File_find (const char *file, const char *ext, const char *path); 120char * rxvt_File_find (const char *file, const char *ext, const char *path);
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
123void rxvt_usleep (int usecs);
123 124
124/* 125/*
125 ***************************************************************************** 126 *****************************************************************************
126 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
127 ***************************************************************************** 128 *****************************************************************************
… …
137#endif 138#endif
138 139
139/* If we're using either the rxvt scrollbar or menu bars, keep the 140/* If we're using either the rxvt scrollbar or menu bars, keep the
140 * scrollColor resource. 141 * scrollColor resource.
141 */ 142 */
142#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
143# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
144#else 145#else
145# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
146#endif 147#endif
147 148
… …
267 268
268#define R_SB_ALIGN_CENTRE 0 269#define R_SB_ALIGN_CENTRE 0
269#define R_SB_ALIGN_TOP 1 270#define R_SB_ALIGN_TOP 1
270#define R_SB_ALIGN_BOTTOM 2 271#define R_SB_ALIGN_BOTTOM 2
271 272
272#define R_SB_RXVT 0
273#define R_SB_NEXT 1 273#define R_SB_NEXT 1
274#define R_SB_XTERM 2 274#define R_SB_XTERM 2
275#define R_SB_PLAIN 4 275#define R_SB_PLAIN 4
276#define R_SB_RXVT 8
276 277
277#define SB_WIDTH_NEXT 19 278#define SB_WIDTH_NEXT 19
278#define SB_WIDTH_XTERM 15 279#define SB_WIDTH_XTERM 15
279#define SB_WIDTH_PLAIN 7 280#define SB_WIDTH_PLAIN 7
280#ifndef SB_WIDTH_RXVT 281#ifndef SB_WIDTH_RXVT
… …
490 URxvt_view_down = 721, 491 URxvt_view_down = 721,
491}; 492};
492 493
493/* Words starting with `Color_' are colours. Others are counts */ 494/* Words starting with `Color_' are colours. Others are counts */
494/* 495/*
495 * The following comment is mostly obsolete since pixcolor_set was expanded:
496 * We're currently upto 29 colours. Only 3 more available. The
497 * PixColor and rendition colour usage should probably be decoupled 496 * The PixColor and rendition colour usage should probably be decoupled
498 * on the unnecessary items, e.g. Color_pointer, but won't bother 497 * on the unnecessary items, e.g. Color_pointer, but won't bother
499 * until we need to. Also, be aware of usage in pixcolor_set 498 * until we need to. Also, be aware of usage in pixcolor_set
500 */ 499 */
501 500
502enum colour_list { 501enum colour_list {
… …
551 Color_scroll, 550 Color_scroll,
552 Color_trough, 551 Color_trough,
553#endif 552#endif
554#if TINTING 553#if TINTING
555 Color_tint, 554 Color_tint,
555#endif
556#if OFF_FOCUS_FADING
557 Color_fade,
556#endif 558#endif
557 NRS_COLORS, /* */ 559 NRS_COLORS, /* */
558#ifdef KEEP_SCROLLCOLOR 560#ifdef KEEP_SCROLLCOLOR
559 Color_topShadow = NRS_COLORS, 561 Color_topShadow = NRS_COLORS,
560 Color_bottomShadow, 562 Color_bottomShadow,
… …
1227 void scr_overlay_off (); 1229 void scr_overlay_off ();
1228 void scr_overlay_set (int x, int y, 1230 void scr_overlay_set (int x, int y,
1229 text_t text, 1231 text_t text,
1230 rend_t rend = OVERLAY_RSTYLE); 1232 rend_t rend = OVERLAY_RSTYLE);
1231 void scr_overlay_set (int x, int y, const char *s); 1233 void scr_overlay_set (int x, int y, const char *s);
1234 void scr_overlay_set (int x, int y, const wchar_t *s);
1232#endif 1235#endif
1233 1236
1234 vector<void *> allocated; // free these memory blocks with free() 1237 vector<void *> allocated; // free these memory blocks with free()
1235 1238
1236 char *env_windowid; /* environmental variable WINDOWID */ 1239 char *env_windowid; /* environmental variable WINDOWID */
… …
1275 1278
1276#if TRANSPARENT 1279#if TRANSPARENT
1277 void rootwin_cb (XEvent &xev); 1280 void rootwin_cb (XEvent &xev);
1278 xevent_watcher rootwin_ev; 1281 xevent_watcher rootwin_ev;
1279#endif 1282#endif
1280
1281
1282 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1283 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1284 1283
1285 void x_cb (XEvent &xev); 1284 void x_cb (XEvent &xev);
1286 xevent_watcher termwin_ev; 1285 xevent_watcher termwin_ev;
1287 xevent_watcher vt_ev; 1286 xevent_watcher vt_ev;
1288#ifdef HAVE_SCROLLBARS 1287#ifdef HAVE_SCROLLBARS

Diff Legend

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