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.353 by ayin, Sat Jan 26 15:26:54 2008 UTC vs.
Revision 1.356 by ayin, Tue Jan 29 14:45:54 2008 UTC

… …
209 ***************************************************************************** 209 *****************************************************************************
210 * STRUCTURES AND TYPEDEFS 210 * STRUCTURES AND TYPEDEFS
211 ***************************************************************************** 211 *****************************************************************************
212 */ 212 */
213 213
214/* If we're using either the rxvt scrollbar, keep the
215 * scrollColor resource.
216 */
217#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
218# define KEEP_SCROLLCOLOR 1
219#else
220# undef KEEP_SCROLLCOLOR
221#endif
222
223/* 214/*
224 * the 'essential' information for reporting Mouse Events 215 * the 'essential' information for reporting Mouse Events
225 * pared down from XButtonEvent 216 * pared down from XButtonEvent
226 */ 217 */
227struct mouse_event { 218struct mouse_event {
… …
276#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 267#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
277# define NO_MOUSE_REPORT_SCROLLBAR 1 268# define NO_MOUSE_REPORT_SCROLLBAR 1
278#endif 269#endif
279 270
280#define scrollBar_esc 30 271#define scrollBar_esc 30
281
282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
283# define HAVE_SCROLLBARS 1
284#endif
285 272
286#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR) 273#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
287# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1 274# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
288#endif 275#endif
289 276
… …
501 Color_underline, 488 Color_underline,
502#endif 489#endif
503#ifdef OPTION_HC 490#ifdef OPTION_HC
504 Color_HC, 491 Color_HC,
505#endif 492#endif
506#ifdef KEEP_SCROLLCOLOR
507 Color_scroll, 493 Color_scroll,
494#ifdef RXVT_SCROLLBAR
508 Color_trough, 495 Color_trough,
509#endif 496#endif
510#if ENABLE_TRANSPARENCY 497#if ENABLE_TRANSPARENCY
511 Color_tint, 498 Color_tint,
512#endif 499#endif
513#if OFF_FOCUS_FADING 500#if OFF_FOCUS_FADING
514 Color_fade, 501 Color_fade,
515#endif 502#endif
516 NRS_COLORS, /* */ 503 NRS_COLORS, /* */
517#ifdef KEEP_SCROLLCOLOR 504#ifdef RXVT_SCROLLBAR
518 Color_topShadow = NRS_COLORS, 505 Color_topShadow = NRS_COLORS,
519 Color_bottomShadow, 506 Color_bottomShadow,
520 TOTAL_COLORS 507 TOTAL_COLORS
521#else 508#else
522 TOTAL_COLORS = NRS_COLORS 509 TOTAL_COLORS = NRS_COLORS
… …
1155#endif 1142#endif
1156 1143
1157 void x_cb (XEvent &xev); 1144 void x_cb (XEvent &xev);
1158 xevent_watcher termwin_ev; 1145 xevent_watcher termwin_ev;
1159 xevent_watcher vt_ev; 1146 xevent_watcher vt_ev;
1160#ifdef HAVE_SCROLLBARS
1161 xevent_watcher scrollbar_ev; 1147 xevent_watcher scrollbar_ev;
1162#endif
1163 1148
1164 void child_cb (ev::child &w, int revents); ev::child child_ev; 1149 void child_cb (ev::child &w, int revents); ev::child child_ev;
1165 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1150 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1166 void refresh_check (); 1151 void refresh_check ();
1167 void flush (); 1152 void flush ();
… …
1494 1479
1495 // scrollbar.C 1480 // scrollbar.C
1496 void resize_scrollbar (); 1481 void resize_scrollbar ();
1497 int scrollbar_mapping (int map); 1482 int scrollbar_mapping (int map);
1498 int scrollbar_show (int update); 1483 int scrollbar_show (int update);
1499 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1500 1484
1501 // xdefaults.C 1485 // xdefaults.C
1502 void get_options (int argc, const char *const *argv); 1486 void get_options (int argc, const char *const *argv);
1503 int parse_keysym (const char *str, const char *arg); 1487 int parse_keysym (const char *str, const char *arg);
1504 const char *x_resource (const char *name); 1488 const char *x_resource (const char *name);

Diff Legend

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