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.442 by sf-exg, Sun May 1 13:54:27 2011 UTC vs.
Revision 1.446 by sf-exg, Tue Aug 9 18:41:31 2011 UTC

… …
157 157
158const char * rxvt_basename (const char *str) NOTHROW; 158const char * rxvt_basename (const char *str) NOTHROW;
159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
160void rxvt_log (const char *fmt,...) NOTHROW; 160void rxvt_log (const char *fmt,...) NOTHROW;
161void rxvt_warn (const char *fmt,...) NOTHROW; 161void rxvt_warn (const char *fmt,...) NOTHROW;
162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
164 164
165char * rxvt_strtrim (char *str) NOTHROW; 165char * rxvt_strtrim (char *str) NOTHROW;
166char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 166char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
167 167
168static inline void 168static inline void
… …
667 667
668#define GET_ATTR(x) (((x) & RS_attrMask)) 668#define GET_ATTR(x) (((x) & RS_attrMask))
669// return attributes defining the background, encoding doesn't matter 669// return attributes defining the background, encoding doesn't matter
670// depends on RS_fgShift > RS_bgShift 670// depends on RS_fgShift > RS_bgShift
671#define GET_BGATTR(x) \ 671#define GET_BGATTR(x) \
672 (expect_false ((x) & RS_RVid) \ 672 (ecb_unlikely ((x) & RS_RVid) \
673 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 673 ? (((x) & (RS_attrMask & ~RS_RVid)) \
674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
675 : ((x) & (RS_attrMask | RS_bgMask))) 675 : ((x) & (RS_attrMask | RS_bgMask)))
676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
981 scrollBar_t scrollBar; 981 scrollBar_t scrollBar;
982 uint8_t options[(Opt_count + 7) >> 3]; 982 uint8_t options[(Opt_count + 7) >> 3];
983 XSizeHints szHint; 983 XSizeHints szHint;
984 rxvt_color *pix_colors; 984 rxvt_color *pix_colors;
985 Cursor TermWin_cursor; /* cursor for vt window */ 985 Cursor TermWin_cursor; /* cursor for vt window */
986 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 986 line_t *row_buf; // all lines, scrollback + terminal, circular
987 line_t *drawn_buf; // text on screen 987 line_t *drawn_buf; // text on screen
988 line_t *swap_buf; // lines for swap buffer 988 line_t *swap_buf; // lines for swap buffer
989 char *tabs; /* per location: 1 == tab-stop */ 989 char *tabs; /* per location: 1 == tab-stop */
990 screen_t screen; 990 screen_t screen;
991 screen_t swap; 991 screen_t swap;
… …
1101 1101
1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR, 1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1103 1103
1104 BG_PROP_SCALE = 1 << 3, 1104 BG_PROP_SCALE = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4, 1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14,
1106 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN, 1107 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN | BG_TILE,
1107 1108
1108 BG_TINT_SET = 1 << 5, 1109 BG_TINT_SET = 1 << 5,
1109 BG_TINT_BITAND = 1 << 6, 1110 BG_TINT_BITAND = 1 << 6,
1110 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND, 1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1111 1112
… …
1341 void im_set_size (XRectangle &size); 1342 void im_set_size (XRectangle &size);
1342 void im_set_position (XPoint &pos) NOTHROW; 1343 void im_set_position (XPoint &pos) NOTHROW;
1343 void im_set_color (unsigned long &fg, unsigned long &bg); 1344 void im_set_color (unsigned long &fg, unsigned long &bg);
1344 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);
1345 1346
1346 bool IMisRunning (); 1347 bool im_is_running ();
1347 void IMSendSpot (); 1348 void im_send_spot ();
1348 bool IM_get_IC (const char *modifiers); 1349 bool im_get_ic (const char *modifiers);
1349 void IMSetPosition (); 1350 void im_set_position ();
1350#endif 1351#endif
1351 1352
1352 // command.C 1353 // command.C
1353 void key_press (XKeyEvent &ev); 1354 void key_press (XKeyEvent &ev);
1354 void key_release (XKeyEvent &ev); 1355 void key_release (XKeyEvent &ev);

Diff Legend

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