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.448 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs.
Revision 1.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC

… …
877 int fwidth; /* font width [pixels] */ 877 int fwidth; /* font width [pixels] */
878 int fheight; /* font height [pixels] */ 878 int fheight; /* font height [pixels] */
879 int fbase; /* font ascent (baseline) [pixels] */ 879 int fbase; /* font ascent (baseline) [pixels] */
880 int ncol; /* window columns [characters] */ 880 int ncol; /* window columns [characters] */
881 int nrow; /* window rows [characters] */ 881 int nrow; /* window rows [characters] */
882 bool focus; /* window has focus */ 882 int focus; /* window has focus */
883 bool mapped; /* window state mapped? */ 883 int mapped; /* window state mapped? */
884 int int_bwidth; /* internal border width */ 884 int int_bwidth; /* internal border width */
885 int ext_bwidth; /* external border width */ 885 int ext_bwidth; /* external border width */
886 int lineSpace; /* number of extra pixels between rows */ 886 int lineSpace; /* number of extra pixels between rows */
887 int letterSpace; /* number of extra pixels between columns */ 887 int letterSpace; /* number of extra pixels between columns */
888 int saveLines; /* number of lines that fit in scrollback */ 888 int saveLines; /* number of lines that fit in scrollback */
… …
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
… …
1161 bool bg_set_shade (const char *shade_str); 1161 bool bg_set_shade (const char *shade_str);
1162 bool bg_set_blur (const char *geom); 1162 bool bg_set_blur (const char *geom);
1163 1163
1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1165 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);
1166 unsigned long make_transparency_pixmap (); 1167 unsigned long make_transparency_pixmap ();
1167# endif 1168# endif
1168 1169
1169 ev_tstamp bg_valid_since; 1170 ev_tstamp bg_valid_since;
1170 1171
… …
1315 void pointer_unblank (); 1316 void pointer_unblank ();
1316 1317
1317 void tt_printf (const char *fmt,...); 1318 void tt_printf (const char *fmt,...);
1318 void tt_write (const char *data, unsigned int len); 1319 void tt_write (const char *data, unsigned int len);
1319 void pty_write (); 1320 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 1321
1327 void make_current () const // make this the "currently active" urxvt instance 1322 void make_current () const // make this the "currently active" urxvt instance
1328 { 1323 {
1329 SET_R (this); 1324 SET_R (this);
1330 set_environ (envv); 1325 set_environ (envv);
… …
1388 void process_xterm_seq (int op, char *str, char resp); 1383 void process_xterm_seq (int op, char *str, char resp);
1389 int privcases (int mode, unsigned long bit); 1384 int privcases (int mode, unsigned long bit);
1390 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);
1391 void process_sgr_mode (unsigned int nargs, const int *arg); 1386 void process_sgr_mode (unsigned int nargs, const int *arg);
1392 // 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);
1393 void init_vars (); 1391 void init_vars ();
1394 const char **init_resources (int argc, const char *const *argv); 1392 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 (); 1393 void init_env ();
1397 void set_locale (const char *locale); 1394 void set_locale (const char *locale);
1398 void init_xlocale (); 1395 void init_xlocale ();
1399 void init_command (const char *const *argv); 1396 void init_command (const char *const *argv);
1400 void run_command (const char *const *argv); 1397 void run_command (const char *const *argv);
… …
1463#ifndef NO_BRIGHTCOLOR 1460#ifndef NO_BRIGHTCOLOR
1464 if (r & RS_Bold 1461 if (r & RS_Bold
1465# if ENABLE_STYLES 1462# if ENABLE_STYLES
1466 && option (Opt_intensityStyles) 1463 && option (Opt_intensityStyles)
1467# endif 1464# endif
1468 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1465 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1469 base += minBrightCOLOR - minCOLOR; 1466 base += minBrightCOLOR - minCOLOR;
1470#endif 1467#endif
1471 return base; 1468 return base;
1472 } 1469 }
1473 1470
… …
1477#ifndef NO_BRIGHTCOLOR 1474#ifndef NO_BRIGHTCOLOR
1478 if (r & RS_Blink 1475 if (r & RS_Blink
1479# if ENABLE_STYLES 1476# if ENABLE_STYLES
1480 && option (Opt_intensityStyles) 1477 && option (Opt_intensityStyles)
1481# endif 1478# endif
1482 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1479 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1483 base += minBrightCOLOR - minCOLOR; 1480 base += minBrightCOLOR - minCOLOR;
1484#endif 1481#endif
1485 return base; 1482 return base;
1486 } 1483 }
1487 1484
… …
1569 void selection_click (int clicks, int x, int y) NOTHROW; 1566 void selection_click (int clicks, int x, int y) NOTHROW;
1570 void selection_extend (int x, int y, int flag) NOTHROW; 1567 void selection_extend (int x, int y, int flag) NOTHROW;
1571 void selection_rotate (int x, int y) NOTHROW; 1568 void selection_rotate (int x, int y) NOTHROW;
1572 1569
1573 // xdefaults.C 1570 // xdefaults.C
1574 void get_options (int argc, const char *const *argv); 1571 const char **get_options (int argc, const char *const *argv);
1575 int parse_keysym (const char *str, const char *arg); 1572 int parse_keysym (const char *str, const char *arg);
1576 const char *x_resource (const char *name); 1573 const char *x_resource (const char *name);
1577 void extract_resources (); 1574 void extract_resources ();
1575 void extract_keysym_resources ();
1578}; 1576};
1579 1577
1580#endif /* _RXVT_H_ */ 1578#endif /* _RXVT_H_ */
1581 1579

Diff Legend

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