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.444 by sf-exg, Fri Jul 8 20:54:31 2011 UTC vs.
Revision 1.458 by sf-exg, Sun Jan 1 17:43:47 2012 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_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
… …
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);
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
… …
1315 1317
1316 void tt_printf (const char *fmt,...); 1318 void tt_printf (const char *fmt,...);
1317 void tt_write (const char *data, unsigned int len); 1319 void tt_write (const char *data, unsigned int len);
1318 void pty_write (); 1320 void pty_write ();
1319 1321
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 1322 void make_current () const // make this the "currently active" urxvt instance
1327 { 1323 {
1328 SET_R (this); 1324 SET_R (this);
1329 set_environ (envv); 1325 set_environ (envv);
1330 rxvt_set_locale (locale); 1326 rxvt_set_locale (locale);
… …
1341 void im_set_size (XRectangle &size); 1337 void im_set_size (XRectangle &size);
1342 void im_set_position (XPoint &pos) NOTHROW; 1338 void im_set_position (XPoint &pos) NOTHROW;
1343 void im_set_color (unsigned long &fg, unsigned long &bg); 1339 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); 1340 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1345 1341
1346 bool IMisRunning (); 1342 bool im_is_running ();
1347 void IMSendSpot (); 1343 void im_send_spot ();
1348 bool IM_get_IC (const char *modifiers); 1344 bool im_get_ic (const char *modifiers);
1349 void IMSetPosition (); 1345 void im_set_position ();
1350#endif 1346#endif
1351 1347
1352 // command.C 1348 // command.C
1353 void key_press (XKeyEvent &ev); 1349 void key_press (XKeyEvent &ev);
1354 void key_release (XKeyEvent &ev); 1350 void key_release (XKeyEvent &ev);
… …
1387 void process_xterm_seq (int op, char *str, char resp); 1383 void process_xterm_seq (int op, char *str, char resp);
1388 int privcases (int mode, unsigned long bit); 1384 int privcases (int mode, unsigned long bit);
1389 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1385 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); 1386 void process_sgr_mode (unsigned int nargs, const int *arg);
1391 // init.C 1387 // init.C
1388 void init (stringvec *argv, stringvec *envv);
1389 void init (int argc, const char *const *argv, const char *const *envv);
1390 void init2 (int argc, const char *const *argv);
1392 void init_vars (); 1391 void init_vars ();
1393 const char **init_resources (int argc, const char *const *argv); 1392 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 (); 1393 void init_env ();
1396 void set_locale (const char *locale); 1394 void set_locale (const char *locale);
1397 void init_xlocale (); 1395 void init_xlocale ();
1398 void init_command (const char *const *argv); 1396 void init_command (const char *const *argv);
1399 void run_command (const char *const *argv); 1397 void run_command (const char *const *argv);
… …
1462#ifndef NO_BRIGHTCOLOR 1460#ifndef NO_BRIGHTCOLOR
1463 if (r & RS_Bold 1461 if (r & RS_Bold
1464# if ENABLE_STYLES 1462# if ENABLE_STYLES
1465 && option (Opt_intensityStyles) 1463 && option (Opt_intensityStyles)
1466# endif 1464# endif
1467 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1465 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1468 base += minBrightCOLOR - minCOLOR; 1466 base += minBrightCOLOR - minCOLOR;
1469#endif 1467#endif
1470 return base; 1468 return base;
1471 } 1469 }
1472 1470
… …
1476#ifndef NO_BRIGHTCOLOR 1474#ifndef NO_BRIGHTCOLOR
1477 if (r & RS_Blink 1475 if (r & RS_Blink
1478# if ENABLE_STYLES 1476# if ENABLE_STYLES
1479 && option (Opt_intensityStyles) 1477 && option (Opt_intensityStyles)
1480# endif 1478# endif
1481 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1479 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1482 base += minBrightCOLOR - minCOLOR; 1480 base += minBrightCOLOR - minCOLOR;
1483#endif 1481#endif
1484 return base; 1482 return base;
1485 } 1483 }
1486 1484
… …
1488 { 1486 {
1489 return options[opt >> 3] & (1 << (opt & 7)); 1487 return options[opt >> 3] & (1 << (opt & 7));
1490 } 1488 }
1491 1489
1492 void set_option (uint8_t opt, bool set = true) NOTHROW; 1490 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 1491
1502 // modifies first argument(!) 1492 // modifies first argument(!)
1503 void tt_paste (char *data, unsigned int len) NOTHROW; 1493 void tt_paste (char *data, unsigned int len) NOTHROW;
1504 void paste (char *data, unsigned int len) NOTHROW; 1494 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; 1495 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; 1566 void selection_click (int clicks, int x, int y) NOTHROW;
1577 void selection_extend (int x, int y, int flag) NOTHROW; 1567 void selection_extend (int x, int y, int flag) NOTHROW;
1578 void selection_rotate (int x, int y) NOTHROW; 1568 void selection_rotate (int x, int y) NOTHROW;
1579 1569
1580 // xdefaults.C 1570 // xdefaults.C
1581 void get_options (int argc, const char *const *argv); 1571 const char **get_options (int argc, const char *const *argv);
1582 int parse_keysym (const char *str, const char *arg); 1572 int parse_keysym (const char *str, const char *arg);
1583 const char *x_resource (const char *name); 1573 const char *x_resource (const char *name);
1584 void extract_resources (); 1574 void extract_resources ();
1575 void extract_keysym_resources ();
1585}; 1576};
1586 1577
1587#endif /* _RXVT_H_ */ 1578#endif /* _RXVT_H_ */
1588 1579

Diff Legend

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