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.140 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.145 by root, Fri Feb 4 11:41:23 2005 UTC

… …
563#ifdef HAVE_SCROLLBARS 563#ifdef HAVE_SCROLLBARS
564 Rs_scrollBar, 564 Rs_scrollBar,
565 Rs_scrollBar_right, 565 Rs_scrollBar_right,
566 Rs_scrollBar_floating, 566 Rs_scrollBar_floating,
567 Rs_scrollBar_align, 567 Rs_scrollBar_align,
568#endif
569 Rs_scrollstyle, /* Rs_scrollBar_style */ 568 Rs_scrollstyle, /* Rs_scrollBar_style */
569 Rs_scrollBar_thickness,
570#endif
570 Rs_scrollTtyOutput, 571 Rs_scrollTtyOutput,
571 Rs_scrollTtyKeypress, 572 Rs_scrollTtyKeypress,
572 Rs_scrollWithBuffer, 573 Rs_scrollWithBuffer,
573 Rs_saveLines, 574 Rs_saveLines,
574 Rs_utmpInhibit, 575 Rs_utmpInhibit,
… …
603#if ENABLE_FRILLS 604#if ENABLE_FRILLS
604 Rs_ext_bwidth, 605 Rs_ext_bwidth,
605 Rs_int_bwidth, 606 Rs_int_bwidth,
606 Rs_borderLess, 607 Rs_borderLess,
607#endif 608#endif
608 Rs_scrollBar_thickness,
609#if ENABLE_FRILLS 609#if ENABLE_FRILLS
610 Rs_lineSpace, 610 Rs_lineSpace,
611#endif 611#endif
612 Rs_cutchars, 612 Rs_cutchars,
613 Rs_modifier, 613 Rs_modifier,
… …
616 Rs_insecure, 616 Rs_insecure,
617 Rs_cursorBlink, 617 Rs_cursorBlink,
618 Rs_pointerBlank, 618 Rs_pointerBlank,
619 Rs_pointerBlankDelay, 619 Rs_pointerBlankDelay,
620 Rs_imLocale, 620 Rs_imLocale,
621 Rs_imFont,
621 Rs_pastableTabs, 622 Rs_pastableTabs,
622#ifndef NO_SECONDARY_SCREEN 623#ifndef NO_SECONDARY_SCREEN
623 Rs_secondaryScreen, 624 Rs_secondaryScreen,
624 Rs_secondaryScroll, 625 Rs_secondaryScroll,
625#endif 626#endif
… …
758#define strdup(x) strdup((const char *)(x)) 759#define strdup(x) strdup((const char *)(x))
759#define strlen(x) strlen((const char *)(x)) 760#define strlen(x) strlen((const char *)(x))
760#define strchr(x, y) strchr((const char *)(x), (int)(y)) 761#define strchr(x, y) strchr((const char *)(x), (int)(y))
761#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 762#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
762 763
764#define dDisp Display *disp = display->display
765
763/* convert pixel dimensions to row/column values. Everything as int32_t */ 766/* convert pixel dimensions to row/column values. Everything as int32_t */
764#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 767#define Pixel2Col(x) Pixel2Width((int32_t)(x))
765#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 768#define Pixel2Row(y) Pixel2Height((int32_t)(y))
766#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 769#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
767#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 770#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
… …
864#ifdef XPM_BACKGROUND 867#ifdef XPM_BACKGROUND
865# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 868# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
866#else 869#else
867# define XPMClearArea(a, b, c, d, e, f, g) 870# define XPMClearArea(a, b, c, d, e, f, g)
868#endif 871#endif
869
870#ifndef STRICT_FONT_CHECKING
871# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
872#endif
873
874#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
875#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
876 872
877#ifdef UTMP_SUPPORT 873#ifdef UTMP_SUPPORT
878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 874# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
879# undef HAVE_UTMPX_H 875# undef HAVE_UTMPX_H
880# undef HAVE_STRUCT_UTMPX 876# undef HAVE_STRUCT_UTMPX
… …
1229 void rootwin_cb (XEvent &xev); 1225 void rootwin_cb (XEvent &xev);
1230 xevent_watcher rootwin_ev; 1226 xevent_watcher rootwin_ev;
1231#endif 1227#endif
1232 1228
1233 1229
1234 void sig_term (sig_watcher &w); sig_watcher sw_term; 1230 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1235 void sig_chld (sig_watcher &w); sig_watcher sw_chld; 1231 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1236 1232
1237 void x_cb (XEvent &xev); 1233 void x_cb (XEvent &xev);
1238 xevent_watcher termwin_ev; 1234 xevent_watcher termwin_ev;
1239 xevent_watcher vt_ev; 1235 xevent_watcher vt_ev;
… …
1282 void tt_winch (); 1278 void tt_winch ();
1283 1279
1284 rxvt_term (); 1280 rxvt_term ();
1285 ~rxvt_term (); 1281 ~rxvt_term ();
1286 void destroy (); 1282 void destroy ();
1283 void emergency_cleanup ();
1287 1284
1288 bool init (int argc, const char *const *argv); 1285 bool init (int argc, const char *const *argv);
1289 bool init_vars (); 1286 bool init_vars ();
1290 1287
1291 bool pty_fill (); 1288 bool pty_fill ();
… …
1515 1512
1516 // xdefaults.C 1513 // xdefaults.C
1517 void get_options (int argc, const char *const *argv); 1514 void get_options (int argc, const char *const *argv);
1518 int parse_keysym (const char *str, const char *arg); 1515 int parse_keysym (const char *str, const char *arg);
1519 void get_xdefaults (FILE *stream, const char *name); 1516 void get_xdefaults (FILE *stream, const char *name);
1520 void extract_resources (Display *display, const char *name); 1517 void extract_resources ();
1521 // xpm.C 1518 // xpm.C
1522 int scale_pixmap (const char *geom); 1519 int scale_pixmap (const char *geom);
1523 void resize_pixmap (); 1520 void resize_pixmap ();
1524 Pixmap set_bgPixmap (const char *file); 1521 Pixmap set_bgPixmap (const char *file);
1525}; 1522};

Diff Legend

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