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.446 by sf-exg, Tue Aug 9 18:41:31 2011 UTC vs.
Revision 1.462 by sf-exg, Mon Jan 9 15:45:45 2012 UTC

… …
1028 hidden_pointer:1, 1028 hidden_pointer:1,
1029#endif 1029#endif
1030 enc_utf8:1, /* whether locale uses utf-8 */ 1030 enc_utf8:1, /* whether locale uses utf-8 */
1031 seen_input:1, /* whether we have seen some program output yet */ 1031 seen_input:1, /* whether we have seen some program output yet */
1032 seen_resize:1, /* whether we had a resize event */ 1032 seen_resize:1, /* whether we had a resize event */
1033 init_done:1,
1033 parsed_geometry:1; 1034 parsed_geometry:1;
1034 1035
1035 unsigned char refresh_type, 1036 unsigned char refresh_type,
1036#ifdef META8_OPTION 1037#ifdef META8_OPTION
1037 meta_char; /* Alt-key prefix */ 1038 meta_char; /* Alt-key prefix */
… …
1071 allowedxerror; 1072 allowedxerror;
1072/* ---------- */ 1073/* ---------- */
1073 unsigned int ModLevel3Mask, 1074 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1075 ModMetaMask,
1075 ModNumLockMask; 1076 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, 1077 unsigned long priv_modes,
1079 SavedModes; 1078 SavedModes;
1080/* ---------- */ 1079/* ---------- */
1081 Atom *xa; 1080 Atom *xa;
1082/* ---------- */ 1081/* ---------- */
… …
1099 BG_NEEDS_TINT = 1 << 1, 1098 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2, 1099 BG_NEEDS_BLUR = 1 << 2,
1101 1100
1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR, 1101 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1103 1102
1104 BG_PROP_SCALE = 1 << 3, 1103 BG_KEEP_ASPECT = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4, 1104 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14, 1105 BG_TILE = 1 << 14,
1107 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN | BG_TILE, 1106 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1108 1107
1109 BG_TINT_SET = 1 << 5, 1108 BG_TINT_SET = 1 << 5,
1110 BG_TINT_BITAND = 1 << 6, 1109 BG_TINT_BITAND = 1 << 6,
1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND, 1110 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1112 1111
… …
1161 bool bg_set_shade (const char *shade_str); 1160 bool bg_set_shade (const char *shade_str);
1162 bool bg_set_blur (const char *geom); 1161 bool bg_set_blur (const char *geom);
1163 1162
1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1163 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1165 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1164 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1165 void tint_ximage (Visual *visual, XImage *ximage);
1166 unsigned long make_transparency_pixmap (); 1166 unsigned long make_transparency_pixmap ();
1167# endif 1167# endif
1168 1168
1169 ev_tstamp bg_valid_since; 1169 ev_tstamp bg_valid_since;
1170 1170
… …
1213 void scr_overlay_set (int x, int y, const char *s) NOTHROW; 1213 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1214 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1214 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1215#endif 1215#endif
1216 1216
1217 vector<void *> allocated; // free these memory blocks with free() 1217 vector<void *> allocated; // free these memory blocks with free()
1218
1219 char env_windowid[21]; /* environmental variable WINDOWID */
1220 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1221 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */
1223 1218
1224 char *locale; 1219 char *locale;
1225 char charsets[4]; 1220 char charsets[4];
1226 char *v_buffer; /* pointer to physical buffer */ 1221 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1222 unsigned int v_buflen; /* size of area to write */
… …
1315 void pointer_unblank (); 1310 void pointer_unblank ();
1316 1311
1317 void tt_printf (const char *fmt,...); 1312 void tt_printf (const char *fmt,...);
1318 void tt_write (const char *data, unsigned int len); 1313 void tt_write (const char *data, unsigned int len);
1319 void pty_write (); 1314 void pty_write ();
1320
1321 void init (stringvec *argv, stringvec *envv)
1322 {
1323 this->argv = argv;
1324 init (argv->size (), argv->begin (), envv);
1325 }
1326 1315
1327 void make_current () const // make this the "currently active" urxvt instance 1316 void make_current () const // make this the "currently active" urxvt instance
1328 { 1317 {
1329 SET_R (this); 1318 SET_R (this);
1330 set_environ (envv); 1319 set_environ (envv);
… …
1388 void process_xterm_seq (int op, char *str, char resp); 1377 void process_xterm_seq (int op, char *str, char resp);
1389 int privcases (int mode, unsigned long bit); 1378 int privcases (int mode, unsigned long bit);
1390 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1379 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1391 void process_sgr_mode (unsigned int nargs, const int *arg); 1380 void process_sgr_mode (unsigned int nargs, const int *arg);
1392 // init.C 1381 // init.C
1382 void init (stringvec *argv, stringvec *envv);
1383 void init (int argc, const char *const *argv, const char *const *envv);
1384 void init2 (int argc, const char *const *argv);
1393 void init_vars (); 1385 void init_vars ();
1394 const char **init_resources (int argc, const char *const *argv); 1386 const char **init_resources (int argc, const char *const *argv);
1395 void init (int argc, const char *const *argv, stringvec *envv);
1396 void init_env (); 1387 void init_env ();
1397 void set_locale (const char *locale); 1388 void set_locale (const char *locale);
1398 void init_xlocale (); 1389 void init_xlocale ();
1399 void init_command (const char *const *argv); 1390 void init_command (const char *const *argv);
1400 void run_command (const char *const *argv); 1391 void run_command (const char *const *argv);
… …
1418 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1409 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1419 void set_utf8_property (Atom prop, const char *str, int len = -1); 1410 void set_utf8_property (Atom prop, const char *str, int len = -1);
1420 void set_title (const char *str); 1411 void set_title (const char *str);
1421 void set_icon_name (const char *str); 1412 void set_icon_name (const char *str);
1422 void set_window_color (int idx, const char *color); 1413 void set_window_color (int idx, const char *color);
1423 void set_colorfgbg (); 1414 char *get_colorfgbg ();
1424 bool set_color (rxvt_color &color, const char *name); 1415 bool set_color (rxvt_color &color, const char *name);
1425 void alias_color (int dst, int src); 1416 void alias_color (int dst, int src);
1426 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1417 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1427 void get_window_origin (int &x, int &y); 1418 void get_window_origin (int &x, int &y);
1428 Pixmap get_pixmap_property (Atom property); 1419 Pixmap get_pixmap_property (Atom property);
… …
1463#ifndef NO_BRIGHTCOLOR 1454#ifndef NO_BRIGHTCOLOR
1464 if (r & RS_Bold 1455 if (r & RS_Bold
1465# if ENABLE_STYLES 1456# if ENABLE_STYLES
1466 && option (Opt_intensityStyles) 1457 && option (Opt_intensityStyles)
1467# endif 1458# endif
1468 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1459 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1469 base += minBrightCOLOR - minCOLOR; 1460 base += minBrightCOLOR - minCOLOR;
1470#endif 1461#endif
1471 return base; 1462 return base;
1472 } 1463 }
1473 1464
… …
1477#ifndef NO_BRIGHTCOLOR 1468#ifndef NO_BRIGHTCOLOR
1478 if (r & RS_Blink 1469 if (r & RS_Blink
1479# if ENABLE_STYLES 1470# if ENABLE_STYLES
1480 && option (Opt_intensityStyles) 1471 && option (Opt_intensityStyles)
1481# endif 1472# endif
1482 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1473 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1483 base += minBrightCOLOR - minCOLOR; 1474 base += minBrightCOLOR - minCOLOR;
1484#endif 1475#endif
1485 return base; 1476 return base;
1486 } 1477 }
1487 1478
… …
1489 { 1480 {
1490 return options[opt >> 3] & (1 << (opt & 7)); 1481 return options[opt >> 3] & (1 << (opt & 7));
1491 } 1482 }
1492 1483
1493 void set_option (uint8_t opt, bool set = true) NOTHROW; 1484 void set_option (uint8_t opt, bool set = true) NOTHROW;
1494
1495 void set_privmode (unsigned bit, int set) NOTHROW
1496 {
1497 if (set)
1498 priv_modes |= bit;
1499 else
1500 priv_modes &= ~bit;
1501 }
1502 1485
1503 // modifies first argument(!) 1486 // modifies first argument(!)
1504 void tt_paste (char *data, unsigned int len) NOTHROW; 1487 void tt_paste (char *data, unsigned int len) NOTHROW;
1505 void paste (char *data, unsigned int len) NOTHROW; 1488 void paste (char *data, unsigned int len) NOTHROW;
1506 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1489 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1577 void selection_click (int clicks, int x, int y) NOTHROW; 1560 void selection_click (int clicks, int x, int y) NOTHROW;
1578 void selection_extend (int x, int y, int flag) NOTHROW; 1561 void selection_extend (int x, int y, int flag) NOTHROW;
1579 void selection_rotate (int x, int y) NOTHROW; 1562 void selection_rotate (int x, int y) NOTHROW;
1580 1563
1581 // xdefaults.C 1564 // xdefaults.C
1582 void get_options (int argc, const char *const *argv); 1565 const char **get_options (int argc, const char *const *argv);
1583 int parse_keysym (const char *str, const char *arg); 1566 int parse_keysym (const char *str, const char *arg);
1584 const char *x_resource (const char *name); 1567 const char *x_resource (const char *name);
1585 void extract_resources (); 1568 void extract_resources ();
1569 void extract_keysym_resources ();
1586}; 1570};
1587 1571
1588#endif /* _RXVT_H_ */ 1572#endif /* _RXVT_H_ */
1589 1573

Diff Legend

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