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.453 by sf-exg, Mon Dec 12 13:56:03 2011 UTC

… …
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_TILE = 1 << 14,
1107 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN | BG_TILE, 1107 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1108 1108
1109 BG_TINT_SET = 1 << 5, 1109 BG_TINT_SET = 1 << 5,
1110 BG_TINT_BITAND = 1 << 6, 1110 BG_TINT_BITAND = 1 << 6,
1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND, 1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1112 1112
… …
1319 void pty_write (); 1319 void pty_write ();
1320 1320
1321 void init (stringvec *argv, stringvec *envv) 1321 void init (stringvec *argv, stringvec *envv)
1322 { 1322 {
1323 this->argv = argv; 1323 this->argv = argv;
1324 this->envv = envv;
1325 argv->push_back (0);
1326 envv->push_back (0);
1324 init (argv->size (), argv->begin (), envv); 1327 init (argv->size () - 1, argv->begin ());
1325 } 1328 }
1326 1329
1327 void make_current () const // make this the "currently active" urxvt instance 1330 void make_current () const // make this the "currently active" urxvt instance
1328 { 1331 {
1329 SET_R (this); 1332 SET_R (this);
… …
1390 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1393 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); 1394 void process_sgr_mode (unsigned int nargs, const int *arg);
1392 // init.C 1395 // init.C
1393 void init_vars (); 1396 void init_vars ();
1394 const char **init_resources (int argc, const char *const *argv); 1397 const char **init_resources (int argc, const char *const *argv);
1395 void init (int argc, const char *const *argv, stringvec *envv); 1398 void init (int argc, const char *const *argv);
1396 void init_env (); 1399 void init_env ();
1397 void set_locale (const char *locale); 1400 void set_locale (const char *locale);
1398 void init_xlocale (); 1401 void init_xlocale ();
1399 void init_command (const char *const *argv); 1402 void init_command (const char *const *argv);
1400 void run_command (const char *const *argv); 1403 void run_command (const char *const *argv);
… …
1463#ifndef NO_BRIGHTCOLOR 1466#ifndef NO_BRIGHTCOLOR
1464 if (r & RS_Bold 1467 if (r & RS_Bold
1465# if ENABLE_STYLES 1468# if ENABLE_STYLES
1466 && option (Opt_intensityStyles) 1469 && option (Opt_intensityStyles)
1467# endif 1470# endif
1468 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1471 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1469 base += minBrightCOLOR - minCOLOR; 1472 base += minBrightCOLOR - minCOLOR;
1470#endif 1473#endif
1471 return base; 1474 return base;
1472 } 1475 }
1473 1476
… …
1477#ifndef NO_BRIGHTCOLOR 1480#ifndef NO_BRIGHTCOLOR
1478 if (r & RS_Blink 1481 if (r & RS_Blink
1479# if ENABLE_STYLES 1482# if ENABLE_STYLES
1480 && option (Opt_intensityStyles) 1483 && option (Opt_intensityStyles)
1481# endif 1484# endif
1482 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1485 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1483 base += minBrightCOLOR - minCOLOR; 1486 base += minBrightCOLOR - minCOLOR;
1484#endif 1487#endif
1485 return base; 1488 return base;
1486 } 1489 }
1487 1490
… …
1489 { 1492 {
1490 return options[opt >> 3] & (1 << (opt & 7)); 1493 return options[opt >> 3] & (1 << (opt & 7));
1491 } 1494 }
1492 1495
1493 void set_option (uint8_t opt, bool set = true) NOTHROW; 1496 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 1497
1503 // modifies first argument(!) 1498 // modifies first argument(!)
1504 void tt_paste (char *data, unsigned int len) NOTHROW; 1499 void tt_paste (char *data, unsigned int len) NOTHROW;
1505 void paste (char *data, unsigned int len) NOTHROW; 1500 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; 1501 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1581 // xdefaults.C 1576 // xdefaults.C
1582 void get_options (int argc, const char *const *argv); 1577 void get_options (int argc, const char *const *argv);
1583 int parse_keysym (const char *str, const char *arg); 1578 int parse_keysym (const char *str, const char *arg);
1584 const char *x_resource (const char *name); 1579 const char *x_resource (const char *name);
1585 void extract_resources (); 1580 void extract_resources ();
1581 void extract_keysym_resources ();
1586}; 1582};
1587 1583
1588#endif /* _RXVT_H_ */ 1584#endif /* _RXVT_H_ */
1589 1585

Diff Legend

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