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.441 by sf-exg, Fri Apr 29 10:10:20 2011 UTC vs.
Revision 1.447 by sf-exg, Sun Aug 21 20:28:55 2011 UTC

… …
125#endif 125#endif
126 126
127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
128# define EXIT_SUCCESS 0 /* exit function success */ 128# define EXIT_SUCCESS 0 /* exit function success */
129# define EXIT_FAILURE 1 /* exit function failure */ 129# define EXIT_FAILURE 1 /* exit function failure */
130#endif
131
132#ifndef PATH_MAX
133# define PATH_MAX 16384
134#endif 130#endif
135 131
136/****************************************************************************/ 132/****************************************************************************/
137 133
138// exception thrown on fatal (per-instance) errors 134// exception thrown on fatal (per-instance) errors
… …
161 157
162const char * rxvt_basename (const char *str) NOTHROW; 158const char * rxvt_basename (const char *str) NOTHROW;
163void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
164void rxvt_log (const char *fmt,...) NOTHROW; 160void rxvt_log (const char *fmt,...) NOTHROW;
165void rxvt_warn (const char *fmt,...) NOTHROW; 161void rxvt_warn (const char *fmt,...) NOTHROW;
166void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
167void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
168 164
169char * rxvt_strtrim (char *str) NOTHROW; 165char * rxvt_strtrim (char *str) NOTHROW;
170char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 166char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
171 167
172static inline void 168static inline void
… …
671 667
672#define GET_ATTR(x) (((x) & RS_attrMask)) 668#define GET_ATTR(x) (((x) & RS_attrMask))
673// return attributes defining the background, encoding doesn't matter 669// return attributes defining the background, encoding doesn't matter
674// depends on RS_fgShift > RS_bgShift 670// depends on RS_fgShift > RS_bgShift
675#define GET_BGATTR(x) \ 671#define GET_BGATTR(x) \
676 (expect_false ((x) & RS_RVid) \ 672 (ecb_unlikely ((x) & RS_RVid) \
677 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 673 ? (((x) & (RS_attrMask & ~RS_RVid)) \
678 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
679 : ((x) & (RS_attrMask | RS_bgMask))) 675 : ((x) & (RS_attrMask | RS_bgMask)))
680#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
681#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
881 int fwidth; /* font width [pixels] */ 877 int fwidth; /* font width [pixels] */
882 int fheight; /* font height [pixels] */ 878 int fheight; /* font height [pixels] */
883 int fbase; /* font ascent (baseline) [pixels] */ 879 int fbase; /* font ascent (baseline) [pixels] */
884 int ncol; /* window columns [characters] */ 880 int ncol; /* window columns [characters] */
885 int nrow; /* window rows [characters] */ 881 int nrow; /* window rows [characters] */
886 int focus; /* window has focus */ 882 bool focus; /* window has focus */
887 int mapped; /* window state mapped? */ 883 bool mapped; /* window state mapped? */
888 int int_bwidth; /* internal border width */ 884 int int_bwidth; /* internal border width */
889 int ext_bwidth; /* external border width */ 885 int ext_bwidth; /* external border width */
890 int lineSpace; /* number of extra pixels between rows */ 886 int lineSpace; /* number of extra pixels between rows */
891 int letterSpace; /* number of extra pixels between columns */ 887 int letterSpace; /* number of extra pixels between columns */
892 int saveLines; /* number of lines that fit in scrollback */ 888 int saveLines; /* number of lines that fit in scrollback */
… …
985 scrollBar_t scrollBar; 981 scrollBar_t scrollBar;
986 uint8_t options[(Opt_count + 7) >> 3]; 982 uint8_t options[(Opt_count + 7) >> 3];
987 XSizeHints szHint; 983 XSizeHints szHint;
988 rxvt_color *pix_colors; 984 rxvt_color *pix_colors;
989 Cursor TermWin_cursor; /* cursor for vt window */ 985 Cursor TermWin_cursor; /* cursor for vt window */
990 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 986 line_t *row_buf; // all lines, scrollback + terminal, circular
991 line_t *drawn_buf; // text on screen 987 line_t *drawn_buf; // text on screen
992 line_t *swap_buf; // lines for swap buffer 988 line_t *swap_buf; // lines for swap buffer
993 char *tabs; /* per location: 1 == tab-stop */ 989 char *tabs; /* per location: 1 == tab-stop */
994 screen_t screen; 990 screen_t screen;
995 screen_t swap; 991 screen_t swap;
… …
1105 1101
1106 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR, 1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1107 1103
1108 BG_PROP_SCALE = 1 << 3, 1104 BG_PROP_SCALE = 1 << 3,
1109 BG_ROOT_ALIGN = 1 << 4, 1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14,
1110 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN, 1107 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN | BG_TILE,
1111 1108
1112 BG_TINT_SET = 1 << 5, 1109 BG_TINT_SET = 1 << 5,
1113 BG_TINT_BITAND = 1 << 6, 1110 BG_TINT_BITAND = 1 << 6,
1114 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND, 1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1115 1112
… …
1345 void im_set_size (XRectangle &size); 1342 void im_set_size (XRectangle &size);
1346 void im_set_position (XPoint &pos) NOTHROW; 1343 void im_set_position (XPoint &pos) NOTHROW;
1347 void im_set_color (unsigned long &fg, unsigned long &bg); 1344 void im_set_color (unsigned long &fg, unsigned long &bg);
1348 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1345 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1349 1346
1350 bool IMisRunning (); 1347 bool im_is_running ();
1351 void IMSendSpot (); 1348 void im_send_spot ();
1352 bool IM_get_IC (const char *modifiers); 1349 bool im_get_ic (const char *modifiers);
1353 void IMSetPosition (); 1350 void im_set_position ();
1354#endif 1351#endif
1355 1352
1356 // command.C 1353 // command.C
1357 void key_press (XKeyEvent &ev); 1354 void key_press (XKeyEvent &ev);
1358 void key_release (XKeyEvent &ev); 1355 void key_release (XKeyEvent &ev);

Diff Legend

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