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.360 by ayin, Mon Feb 18 09:58:05 2008 UTC

… …
97/* 97/*
98 ***************************************************************************** 98 *****************************************************************************
99 * SYSTEM HACKS 99 * SYSTEM HACKS
100 ***************************************************************************** 100 *****************************************************************************
101 */ 101 */
102/* Consistent defines - please report on the necessity
103 * @ Unixware: defines (__svr4__)
104 */
105#if defined (SVR4) && !defined (__svr4__)
106# define __svr4__ 1
107#endif
108#if defined (sun) && !defined (__sun__)
109# define __sun__ 1
110#endif
111 102
112#ifndef HAVE_XPOINTER 103#ifndef HAVE_XPOINTER
113typedef char *XPointer; 104typedef char *XPointer;
114#endif 105#endif
115 106
… …
209 ***************************************************************************** 200 *****************************************************************************
210 * STRUCTURES AND TYPEDEFS 201 * STRUCTURES AND TYPEDEFS
211 ***************************************************************************** 202 *****************************************************************************
212 */ 203 */
213 204
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/* 205/*
224 * the 'essential' information for reporting Mouse Events 206 * the 'essential' information for reporting Mouse Events
225 * pared down from XButtonEvent 207 * pared down from XButtonEvent
226 */ 208 */
227struct mouse_event { 209struct mouse_event {
… …
276#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 258#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
277# define NO_MOUSE_REPORT_SCROLLBAR 1 259# define NO_MOUSE_REPORT_SCROLLBAR 1
278#endif 260#endif
279 261
280#define scrollBar_esc 30 262#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 263
286#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR) 264#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
287# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1 265# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
288#endif 266#endif
289 267
… …
501 Color_underline, 479 Color_underline,
502#endif 480#endif
503#ifdef OPTION_HC 481#ifdef OPTION_HC
504 Color_HC, 482 Color_HC,
505#endif 483#endif
506#ifdef KEEP_SCROLLCOLOR
507 Color_scroll, 484 Color_scroll,
485#ifdef RXVT_SCROLLBAR
508 Color_trough, 486 Color_trough,
509#endif 487#endif
510#if ENABLE_TRANSPARENCY 488#if ENABLE_TRANSPARENCY
511 Color_tint, 489 Color_tint,
512#endif 490#endif
513#if OFF_FOCUS_FADING 491#if OFF_FOCUS_FADING
514 Color_fade, 492 Color_fade,
515#endif 493#endif
516 NRS_COLORS, /* */ 494 NRS_COLORS, /* */
517#ifdef KEEP_SCROLLCOLOR 495#ifdef RXVT_SCROLLBAR
518 Color_topShadow = NRS_COLORS, 496 Color_topShadow = NRS_COLORS,
519 Color_bottomShadow, 497 Color_bottomShadow,
520 TOTAL_COLORS 498 TOTAL_COLORS
521#else 499#else
522 TOTAL_COLORS = NRS_COLORS 500 TOTAL_COLORS = NRS_COLORS
… …
1012 mouse_slip_wheel_speed, 990 mouse_slip_wheel_speed,
1013#endif 991#endif
1014 refresh_count, 992 refresh_count,
1015 window_vt_x, 993 window_vt_x,
1016 window_vt_y, 994 window_vt_y,
1017 window_sb_x,
1018 mouse_row, 995 mouse_row,
1019 mouse_col, 996 mouse_col,
1020# ifdef POINTER_BLANK 997# ifdef POINTER_BLANK
1021 pointerBlankDelay, 998 pointerBlankDelay,
1022# endif 999# endif
… …
1124 1101
1125#if ENABLE_FRILLS || ISO_14755 1102#if ENABLE_FRILLS || ISO_14755
1126 // ISO 14755 entry support 1103 // ISO 14755 entry support
1127 unicode_t iso14755buf; 1104 unicode_t iso14755buf;
1128 void commit_iso14755 (); 1105 void commit_iso14755 ();
1129 int hex_keyval (XKeyEvent &ev);
1130# if ISO_14755 1106# if ISO_14755
1131 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1107 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1132 void iso14755_54 (int x, int y); 1108 void iso14755_54 (int x, int y);
1133# endif 1109# endif
1134#endif 1110#endif
… …
1155#endif 1131#endif
1156 1132
1157 void x_cb (XEvent &xev); 1133 void x_cb (XEvent &xev);
1158 xevent_watcher termwin_ev; 1134 xevent_watcher termwin_ev;
1159 xevent_watcher vt_ev; 1135 xevent_watcher vt_ev;
1160#ifdef HAVE_SCROLLBARS
1161 xevent_watcher scrollbar_ev; 1136 xevent_watcher scrollbar_ev;
1162#endif
1163 1137
1164 void child_cb (ev::child &w, int revents); ev::child child_ev; 1138 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; 1139 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1166 void refresh_check (); 1140 void refresh_check ();
1167 void flush (); 1141 void flush ();
… …
1381 options[opt >> 3] |= (1 << (opt & 7)); 1355 options[opt >> 3] |= (1 << (opt & 7));
1382 else 1356 else
1383 options[opt >> 3] &= ~(1 << (opt & 7)); 1357 options[opt >> 3] &= ~(1 << (opt & 7));
1384 } 1358 }
1385 1359
1386 void PrivMode (int set, unsigned bit) NOTHROW 1360 void set_privmode (unsigned bit, int set) NOTHROW
1387 { 1361 {
1388 if (set) 1362 if (set)
1389 priv_modes |= bit; 1363 priv_modes |= bit;
1390 else 1364 else
1391 priv_modes &= ~bit; 1365 priv_modes &= ~bit;
… …
1494 1468
1495 // scrollbar.C 1469 // scrollbar.C
1496 void resize_scrollbar (); 1470 void resize_scrollbar ();
1497 int scrollbar_mapping (int map); 1471 int scrollbar_mapping (int map);
1498 int scrollbar_show (int update); 1472 int scrollbar_show (int update);
1499 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1500 1473
1501 // xdefaults.C 1474 // xdefaults.C
1502 void get_options (int argc, const char *const *argv); 1475 void get_options (int argc, const char *const *argv);
1503 int parse_keysym (const char *str, const char *arg); 1476 int parse_keysym (const char *str, const char *arg);
1504 const char *x_resource (const char *name); 1477 const char *x_resource (const char *name);

Diff Legend

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