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.454 by root, Sat Dec 17 23:17:33 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
… …
1315 void pointer_unblank (); 1315 void pointer_unblank ();
1316 1316
1317 void tt_printf (const char *fmt,...); 1317 void tt_printf (const char *fmt,...);
1318 void tt_write (const char *data, unsigned int len); 1318 void tt_write (const char *data, unsigned int len);
1319 void pty_write (); 1319 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 1320
1327 void make_current () const // make this the "currently active" urxvt instance 1321 void make_current () const // make this the "currently active" urxvt instance
1328 { 1322 {
1329 SET_R (this); 1323 SET_R (this);
1330 set_environ (envv); 1324 set_environ (envv);
… …
1388 void process_xterm_seq (int op, char *str, char resp); 1382 void process_xterm_seq (int op, char *str, char resp);
1389 int privcases (int mode, unsigned long bit); 1383 int privcases (int mode, unsigned long bit);
1390 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1384 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); 1385 void process_sgr_mode (unsigned int nargs, const int *arg);
1392 // init.C 1386 // init.C
1387 void init (stringvec *argv, stringvec *envv);
1388 void init (int argc, const char *const *argv, const char *const *envv);
1389 void init2 (int argc, const char *const *argv);
1393 void init_vars (); 1390 void init_vars ();
1394 const char **init_resources (int argc, const char *const *argv); 1391 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 (); 1392 void init_env ();
1397 void set_locale (const char *locale); 1393 void set_locale (const char *locale);
1398 void init_xlocale (); 1394 void init_xlocale ();
1399 void init_command (const char *const *argv); 1395 void init_command (const char *const *argv);
1400 void run_command (const char *const *argv); 1396 void run_command (const char *const *argv);
… …
1463#ifndef NO_BRIGHTCOLOR 1459#ifndef NO_BRIGHTCOLOR
1464 if (r & RS_Bold 1460 if (r & RS_Bold
1465# if ENABLE_STYLES 1461# if ENABLE_STYLES
1466 && option (Opt_intensityStyles) 1462 && option (Opt_intensityStyles)
1467# endif 1463# endif
1468 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1464 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1469 base += minBrightCOLOR - minCOLOR; 1465 base += minBrightCOLOR - minCOLOR;
1470#endif 1466#endif
1471 return base; 1467 return base;
1472 } 1468 }
1473 1469
… …
1477#ifndef NO_BRIGHTCOLOR 1473#ifndef NO_BRIGHTCOLOR
1478 if (r & RS_Blink 1474 if (r & RS_Blink
1479# if ENABLE_STYLES 1475# if ENABLE_STYLES
1480 && option (Opt_intensityStyles) 1476 && option (Opt_intensityStyles)
1481# endif 1477# endif
1482 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1478 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1483 base += minBrightCOLOR - minCOLOR; 1479 base += minBrightCOLOR - minCOLOR;
1484#endif 1480#endif
1485 return base; 1481 return base;
1486 } 1482 }
1487 1483
… …
1489 { 1485 {
1490 return options[opt >> 3] & (1 << (opt & 7)); 1486 return options[opt >> 3] & (1 << (opt & 7));
1491 } 1487 }
1492 1488
1493 void set_option (uint8_t opt, bool set = true) NOTHROW; 1489 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 1490
1503 // modifies first argument(!) 1491 // modifies first argument(!)
1504 void tt_paste (char *data, unsigned int len) NOTHROW; 1492 void tt_paste (char *data, unsigned int len) NOTHROW;
1505 void paste (char *data, unsigned int len) NOTHROW; 1493 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; 1494 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1581 // xdefaults.C 1569 // xdefaults.C
1582 void get_options (int argc, const char *const *argv); 1570 void get_options (int argc, const char *const *argv);
1583 int parse_keysym (const char *str, const char *arg); 1571 int parse_keysym (const char *str, const char *arg);
1584 const char *x_resource (const char *name); 1572 const char *x_resource (const char *name);
1585 void extract_resources (); 1573 void extract_resources ();
1574 void extract_keysym_resources ();
1586}; 1575};
1587 1576
1588#endif /* _RXVT_H_ */ 1577#endif /* _RXVT_H_ */
1589 1578

Diff Legend

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