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.465 by sf-exg, Tue Jan 10 18:50:14 2012 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))
… …
870 * END······················= total_rows 870 * END······················= total_rows
871 */ 871 */
872 872
873struct TermWin_t 873struct TermWin_t
874{ 874{
875 int vt_width; /* actual window width [pixels] */
876 int vt_height; /* actual window height [pixels] */
875 int width; /* window width [pixels] */ 877 int width; /* window width [pixels] */
876 int height; /* window height [pixels] */ 878 int height; /* window height [pixels] */
877 int fwidth; /* font width [pixels] */ 879 int fwidth; /* font width [pixels] */
878 int fheight; /* font height [pixels] */ 880 int fheight; /* font height [pixels] */
879 int fbase; /* font ascent (baseline) [pixels] */ 881 int fbase; /* font ascent (baseline) [pixels] */
… …
891 int view_start; /* scrollback view starts here */ 893 int view_start; /* scrollback view starts here */
892 int top_row; /* topmost row index of scrollback */ 894 int top_row; /* topmost row index of scrollback */
893 Window parent; /* parent identifier */ 895 Window parent; /* parent identifier */
894 Window vt; /* vt100 window */ 896 Window vt; /* vt100 window */
895 GC gc; /* GC for drawing */ 897 GC gc; /* GC for drawing */
896 Pixmap pixmap;
897 rxvt_drawable *drawable; 898 rxvt_drawable *drawable;
898 rxvt_fontset *fontset[4]; 899 rxvt_fontset *fontset[4];
899}; 900};
900 901
901/* 902/*
… …
981 scrollBar_t scrollBar; 982 scrollBar_t scrollBar;
982 uint8_t options[(Opt_count + 7) >> 3]; 983 uint8_t options[(Opt_count + 7) >> 3];
983 XSizeHints szHint; 984 XSizeHints szHint;
984 rxvt_color *pix_colors; 985 rxvt_color *pix_colors;
985 Cursor TermWin_cursor; /* cursor for vt window */ 986 Cursor TermWin_cursor; /* cursor for vt window */
986 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 987 line_t *row_buf; // all lines, scrollback + terminal, circular
987 line_t *drawn_buf; // text on screen 988 line_t *drawn_buf; // text on screen
988 line_t *swap_buf; // lines for swap buffer 989 line_t *swap_buf; // lines for swap buffer
989 char *tabs; /* per location: 1 == tab-stop */ 990 char *tabs; /* per location: 1 == tab-stop */
990 screen_t screen; 991 screen_t screen;
991 screen_t swap; 992 screen_t swap;
… …
1028 hidden_pointer:1, 1029 hidden_pointer:1,
1029#endif 1030#endif
1030 enc_utf8:1, /* whether locale uses utf-8 */ 1031 enc_utf8:1, /* whether locale uses utf-8 */
1031 seen_input:1, /* whether we have seen some program output yet */ 1032 seen_input:1, /* whether we have seen some program output yet */
1032 seen_resize:1, /* whether we had a resize event */ 1033 seen_resize:1, /* whether we had a resize event */
1034 init_done:1,
1033 parsed_geometry:1; 1035 parsed_geometry:1;
1034 1036
1035 unsigned char refresh_type, 1037 unsigned char refresh_type,
1036#ifdef META8_OPTION 1038#ifdef META8_OPTION
1037 meta_char; /* Alt-key prefix */ 1039 meta_char; /* Alt-key prefix */
… …
1071 allowedxerror; 1073 allowedxerror;
1072/* ---------- */ 1074/* ---------- */
1073 unsigned int ModLevel3Mask, 1075 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1076 ModMetaMask,
1075 ModNumLockMask; 1077 ModNumLockMask;
1076 int old_width, /* last used width in screen resize */
1077 old_height; /* last used height in screen resize */
1078 unsigned long priv_modes, 1078 unsigned long priv_modes,
1079 SavedModes; 1079 SavedModes;
1080/* ---------- */ 1080/* ---------- */
1081 Atom *xa; 1081 Atom *xa;
1082/* ---------- */ 1082/* ---------- */
… …
1099 BG_NEEDS_TINT = 1 << 1, 1099 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2, 1100 BG_NEEDS_BLUR = 1 << 2,
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_KEEP_ASPECT = 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_KEEP_ASPECT | 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
… …
1158 void set_tint_shade_flags (); 1159 void set_tint_shade_flags ();
1159 bool bg_set_tint (rxvt_color &new_tint); 1160 bool bg_set_tint (rxvt_color &new_tint);
1160 bool bg_set_shade (const char *shade_str); 1161 bool bg_set_shade (const char *shade_str);
1161 bool bg_set_blur (const char *geom); 1162 bool bg_set_blur (const char *geom);
1162 1163
1163 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1164 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1165 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1166 void tint_ximage (Visual *visual, XImage *ximage);
1165 unsigned long make_transparency_pixmap (); 1167 unsigned long make_transparency_pixmap ();
1166# endif 1168# endif
1167 1169
1168 ev_tstamp bg_valid_since; 1170 ev_tstamp bg_valid_since;
1169 1171
… …
1212 void scr_overlay_set (int x, int y, const char *s) NOTHROW; 1214 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1213 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1215 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1214#endif 1216#endif
1215 1217
1216 vector<void *> allocated; // free these memory blocks with free() 1218 vector<void *> allocated; // free these memory blocks with free()
1217
1218 char env_windowid[21]; /* environmental variable WINDOWID */
1219 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1220 char *env_display; /* environmental variable DISPLAY */
1221 char *env_term; /* environmental variable TERM */
1222 1219
1223 char *locale; 1220 char *locale;
1224 char charsets[4]; 1221 char charsets[4];
1225 char *v_buffer; /* pointer to physical buffer */ 1222 char *v_buffer; /* pointer to physical buffer */
1226 unsigned int v_buflen; /* size of area to write */ 1223 unsigned int v_buflen; /* size of area to write */
… …
1315 1312
1316 void tt_printf (const char *fmt,...); 1313 void tt_printf (const char *fmt,...);
1317 void tt_write (const char *data, unsigned int len); 1314 void tt_write (const char *data, unsigned int len);
1318 void pty_write (); 1315 void pty_write ();
1319 1316
1320 void init (stringvec *argv, stringvec *envv)
1321 {
1322 this->argv = argv;
1323 init (argv->size (), argv->begin (), envv);
1324 }
1325
1326 void make_current () const // make this the "currently active" urxvt instance 1317 void make_current () const // make this the "currently active" urxvt instance
1327 { 1318 {
1328 SET_R (this); 1319 SET_R (this);
1329 set_environ (envv); 1320 set_environ (envv);
1330 rxvt_set_locale (locale); 1321 rxvt_set_locale (locale);
… …
1341 void im_set_size (XRectangle &size); 1332 void im_set_size (XRectangle &size);
1342 void im_set_position (XPoint &pos) NOTHROW; 1333 void im_set_position (XPoint &pos) NOTHROW;
1343 void im_set_color (unsigned long &fg, unsigned long &bg); 1334 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); 1335 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1345 1336
1346 bool IMisRunning (); 1337 bool im_is_running ();
1347 void IMSendSpot (); 1338 void im_send_spot ();
1348 bool IM_get_IC (const char *modifiers); 1339 bool im_get_ic (const char *modifiers);
1349 void IMSetPosition (); 1340 void im_set_position ();
1350#endif 1341#endif
1351 1342
1352 // command.C 1343 // command.C
1353 void key_press (XKeyEvent &ev); 1344 void key_press (XKeyEvent &ev);
1354 void key_release (XKeyEvent &ev); 1345 void key_release (XKeyEvent &ev);
… …
1387 void process_xterm_seq (int op, char *str, char resp); 1378 void process_xterm_seq (int op, char *str, char resp);
1388 int privcases (int mode, unsigned long bit); 1379 int privcases (int mode, unsigned long bit);
1389 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1380 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1390 void process_sgr_mode (unsigned int nargs, const int *arg); 1381 void process_sgr_mode (unsigned int nargs, const int *arg);
1391 // init.C 1382 // init.C
1383 void init (stringvec *argv, stringvec *envv);
1384 void init (int argc, const char *const *argv, const char *const *envv);
1385 void init2 (int argc, const char *const *argv);
1392 void init_vars (); 1386 void init_vars ();
1393 const char **init_resources (int argc, const char *const *argv); 1387 const char **init_resources (int argc, const char *const *argv);
1394 void init (int argc, const char *const *argv, stringvec *envv);
1395 void init_env (); 1388 void init_env ();
1396 void set_locale (const char *locale); 1389 void set_locale (const char *locale);
1397 void init_xlocale (); 1390 void init_xlocale ();
1398 void init_command (const char *const *argv); 1391 void init_command (const char *const *argv);
1399 void run_command (const char *const *argv); 1392 void run_command (const char *const *argv);
… …
1417 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1410 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1418 void set_utf8_property (Atom prop, const char *str, int len = -1); 1411 void set_utf8_property (Atom prop, const char *str, int len = -1);
1419 void set_title (const char *str); 1412 void set_title (const char *str);
1420 void set_icon_name (const char *str); 1413 void set_icon_name (const char *str);
1421 void set_window_color (int idx, const char *color); 1414 void set_window_color (int idx, const char *color);
1422 void set_colorfgbg (); 1415 char *get_colorfgbg ();
1423 bool set_color (rxvt_color &color, const char *name); 1416 bool set_color (rxvt_color &color, const char *name);
1424 void alias_color (int dst, int src); 1417 void alias_color (int dst, int src);
1425 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1418 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1426 void get_window_origin (int &x, int &y); 1419 void get_window_origin (int &x, int &y);
1427 Pixmap get_pixmap_property (Atom property); 1420 Pixmap get_pixmap_property (Atom property);
… …
1462#ifndef NO_BRIGHTCOLOR 1455#ifndef NO_BRIGHTCOLOR
1463 if (r & RS_Bold 1456 if (r & RS_Bold
1464# if ENABLE_STYLES 1457# if ENABLE_STYLES
1465 && option (Opt_intensityStyles) 1458 && option (Opt_intensityStyles)
1466# endif 1459# endif
1467 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1460 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1468 base += minBrightCOLOR - minCOLOR; 1461 base += minBrightCOLOR - minCOLOR;
1469#endif 1462#endif
1470 return base; 1463 return base;
1471 } 1464 }
1472 1465
… …
1476#ifndef NO_BRIGHTCOLOR 1469#ifndef NO_BRIGHTCOLOR
1477 if (r & RS_Blink 1470 if (r & RS_Blink
1478# if ENABLE_STYLES 1471# if ENABLE_STYLES
1479 && option (Opt_intensityStyles) 1472 && option (Opt_intensityStyles)
1480# endif 1473# endif
1481 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1474 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1482 base += minBrightCOLOR - minCOLOR; 1475 base += minBrightCOLOR - minCOLOR;
1483#endif 1476#endif
1484 return base; 1477 return base;
1485 } 1478 }
1486 1479
… …
1488 { 1481 {
1489 return options[opt >> 3] & (1 << (opt & 7)); 1482 return options[opt >> 3] & (1 << (opt & 7));
1490 } 1483 }
1491 1484
1492 void set_option (uint8_t opt, bool set = true) NOTHROW; 1485 void set_option (uint8_t opt, bool set = true) NOTHROW;
1493
1494 void set_privmode (unsigned bit, int set) NOTHROW
1495 {
1496 if (set)
1497 priv_modes |= bit;
1498 else
1499 priv_modes &= ~bit;
1500 }
1501 1486
1502 // modifies first argument(!) 1487 // modifies first argument(!)
1503 void tt_paste (char *data, unsigned int len) NOTHROW; 1488 void tt_paste (char *data, unsigned int len) NOTHROW;
1504 void paste (char *data, unsigned int len) NOTHROW; 1489 void paste (char *data, unsigned int len) NOTHROW;
1505 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1490 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1576 void selection_click (int clicks, int x, int y) NOTHROW; 1561 void selection_click (int clicks, int x, int y) NOTHROW;
1577 void selection_extend (int x, int y, int flag) NOTHROW; 1562 void selection_extend (int x, int y, int flag) NOTHROW;
1578 void selection_rotate (int x, int y) NOTHROW; 1563 void selection_rotate (int x, int y) NOTHROW;
1579 1564
1580 // xdefaults.C 1565 // xdefaults.C
1581 void get_options (int argc, const char *const *argv); 1566 const char **get_options (int argc, const char *const *argv);
1582 int parse_keysym (const char *str, const char *arg); 1567 int parse_keysym (const char *str, const char *arg);
1583 const char *x_resource (const char *name); 1568 const char *x_resource (const char *name);
1584 void extract_resources (); 1569 void extract_resources ();
1570 void extract_keysym_resources ();
1585}; 1571};
1586 1572
1587#endif /* _RXVT_H_ */ 1573#endif /* _RXVT_H_ */
1588 1574

Diff Legend

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