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.460 by sf-exg, Mon Jan 9 15:30:17 2012 UTC

… …
1071 allowedxerror; 1071 allowedxerror;
1072/* ---------- */ 1072/* ---------- */
1073 unsigned int ModLevel3Mask, 1073 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1074 ModMetaMask,
1075 ModNumLockMask; 1075 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, 1076 unsigned long priv_modes,
1079 SavedModes; 1077 SavedModes;
1080/* ---------- */ 1078/* ---------- */
1081 Atom *xa; 1079 Atom *xa;
1082/* ---------- */ 1080/* ---------- */
… …
1099 BG_NEEDS_TINT = 1 << 1, 1097 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2, 1098 BG_NEEDS_BLUR = 1 << 2,
1101 1099
1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR, 1100 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1103 1101
1104 BG_PROP_SCALE = 1 << 3, 1102 BG_KEEP_ASPECT = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4, 1103 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14, 1104 BG_TILE = 1 << 14,
1107 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN | BG_TILE, 1105 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1108 1106
1109 BG_TINT_SET = 1 << 5, 1107 BG_TINT_SET = 1 << 5,
1110 BG_TINT_BITAND = 1 << 6, 1108 BG_TINT_BITAND = 1 << 6,
1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND, 1109 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1112 1110
… …
1161 bool bg_set_shade (const char *shade_str); 1159 bool bg_set_shade (const char *shade_str);
1162 bool bg_set_blur (const char *geom); 1160 bool bg_set_blur (const char *geom);
1163 1161
1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1162 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1165 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1163 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1164 void tint_ximage (Visual *visual, XImage *ximage);
1166 unsigned long make_transparency_pixmap (); 1165 unsigned long make_transparency_pixmap ();
1167# endif 1166# endif
1168 1167
1169 ev_tstamp bg_valid_since; 1168 ev_tstamp bg_valid_since;
1170 1169
… …
1216 1215
1217 vector<void *> allocated; // free these memory blocks with free() 1216 vector<void *> allocated; // free these memory blocks with free()
1218 1217
1219 char env_windowid[21]; /* environmental variable WINDOWID */ 1218 char env_windowid[21]; /* environmental variable WINDOWID */
1220 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1]; 1219 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1221 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */
1223 1220
1224 char *locale; 1221 char *locale;
1225 char charsets[4]; 1222 char charsets[4];
1226 char *v_buffer; /* pointer to physical buffer */ 1223 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1224 unsigned int v_buflen; /* size of area to write */
… …
1315 void pointer_unblank (); 1312 void pointer_unblank ();
1316 1313
1317 void tt_printf (const char *fmt,...); 1314 void tt_printf (const char *fmt,...);
1318 void tt_write (const char *data, unsigned int len); 1315 void tt_write (const char *data, unsigned int len);
1319 void pty_write (); 1316 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 1317
1327 void make_current () const // make this the "currently active" urxvt instance 1318 void make_current () const // make this the "currently active" urxvt instance
1328 { 1319 {
1329 SET_R (this); 1320 SET_R (this);
1330 set_environ (envv); 1321 set_environ (envv);
… …
1388 void process_xterm_seq (int op, char *str, char resp); 1379 void process_xterm_seq (int op, char *str, char resp);
1389 int privcases (int mode, unsigned long bit); 1380 int privcases (int mode, unsigned long bit);
1390 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1381 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); 1382 void process_sgr_mode (unsigned int nargs, const int *arg);
1392 // init.C 1383 // init.C
1384 void init (stringvec *argv, stringvec *envv);
1385 void init (int argc, const char *const *argv, const char *const *envv);
1386 void init2 (int argc, const char *const *argv);
1393 void init_vars (); 1387 void init_vars ();
1394 const char **init_resources (int argc, const char *const *argv); 1388 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 (); 1389 void init_env ();
1397 void set_locale (const char *locale); 1390 void set_locale (const char *locale);
1398 void init_xlocale (); 1391 void init_xlocale ();
1399 void init_command (const char *const *argv); 1392 void init_command (const char *const *argv);
1400 void run_command (const char *const *argv); 1393 void run_command (const char *const *argv);
… …
1463#ifndef NO_BRIGHTCOLOR 1456#ifndef NO_BRIGHTCOLOR
1464 if (r & RS_Bold 1457 if (r & RS_Bold
1465# if ENABLE_STYLES 1458# if ENABLE_STYLES
1466 && option (Opt_intensityStyles) 1459 && option (Opt_intensityStyles)
1467# endif 1460# endif
1468 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1461 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1469 base += minBrightCOLOR - minCOLOR; 1462 base += minBrightCOLOR - minCOLOR;
1470#endif 1463#endif
1471 return base; 1464 return base;
1472 } 1465 }
1473 1466
… …
1477#ifndef NO_BRIGHTCOLOR 1470#ifndef NO_BRIGHTCOLOR
1478 if (r & RS_Blink 1471 if (r & RS_Blink
1479# if ENABLE_STYLES 1472# if ENABLE_STYLES
1480 && option (Opt_intensityStyles) 1473 && option (Opt_intensityStyles)
1481# endif 1474# endif
1482 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1475 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1483 base += minBrightCOLOR - minCOLOR; 1476 base += minBrightCOLOR - minCOLOR;
1484#endif 1477#endif
1485 return base; 1478 return base;
1486 } 1479 }
1487 1480
… …
1489 { 1482 {
1490 return options[opt >> 3] & (1 << (opt & 7)); 1483 return options[opt >> 3] & (1 << (opt & 7));
1491 } 1484 }
1492 1485
1493 void set_option (uint8_t opt, bool set = true) NOTHROW; 1486 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 1487
1503 // modifies first argument(!) 1488 // modifies first argument(!)
1504 void tt_paste (char *data, unsigned int len) NOTHROW; 1489 void tt_paste (char *data, unsigned int len) NOTHROW;
1505 void paste (char *data, unsigned int len) NOTHROW; 1490 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; 1491 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; 1562 void selection_click (int clicks, int x, int y) NOTHROW;
1578 void selection_extend (int x, int y, int flag) NOTHROW; 1563 void selection_extend (int x, int y, int flag) NOTHROW;
1579 void selection_rotate (int x, int y) NOTHROW; 1564 void selection_rotate (int x, int y) NOTHROW;
1580 1565
1581 // xdefaults.C 1566 // xdefaults.C
1582 void get_options (int argc, const char *const *argv); 1567 const char **get_options (int argc, const char *const *argv);
1583 int parse_keysym (const char *str, const char *arg); 1568 int parse_keysym (const char *str, const char *arg);
1584 const char *x_resource (const char *name); 1569 const char *x_resource (const char *name);
1585 void extract_resources (); 1570 void extract_resources ();
1571 void extract_keysym_resources ();
1586}; 1572};
1587 1573
1588#endif /* _RXVT_H_ */ 1574#endif /* _RXVT_H_ */
1589 1575

Diff Legend

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