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.35 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.37 by pcg, Sun Feb 22 08:09:38 2004 UTC

… …
49 int line; 49 int line;
50 int local; 50 int local;
51} ttymode_t; 51} ttymode_t;
52#endif 52#endif
53 53
54#ifdef GREEK_SUPPORT
55# include "grkelot.h"
56#endif
57#ifdef XPM_BACKGROUND 54#ifdef XPM_BACKGROUND
58# ifdef XPM_INC_X11 55# ifdef XPM_INC_X11
59# include <X11/xpm.h> 56# include <X11/xpm.h>
60# else 57# else
61# include <xpm.h> 58# include <xpm.h>
… …
473 Rs_backgroundPixmap, 470 Rs_backgroundPixmap,
474#endif 471#endif
475#if (MENUBAR_MAX) 472#if (MENUBAR_MAX)
476 Rs_menu, 473 Rs_menu,
477#endif 474#endif
478#ifdef GREEK_SUPPORT
479 Rs_greek_keyboard,
480 Rs_greektoggle_key,
481#endif
482 Rs_loginShell, 475 Rs_loginShell,
483 Rs_jumpScroll, 476 Rs_jumpScroll,
484#ifdef HAVE_SCROLLBARS 477#ifdef HAVE_SCROLLBARS
485 Rs_scrollBar, 478 Rs_scrollBar,
486 Rs_scrollBar_right, 479 Rs_scrollBar_right,
… …
819 812
820// primivite wrapper around mbstate_t to ensure initialisation 813// primivite wrapper around mbstate_t to ensure initialisation
821struct mbstate { 814struct mbstate {
822 mbstate_t mbs; 815 mbstate_t mbs;
823 816
824 mbstate () 817 operator mbstate_t *() { return &mbs; }
825 {
826 MEMSET (&mbs, 0, sizeof (mbs)); 818 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
827 } 819 mbstate () { reset (); }
828}; 820};
829 821
830struct rxvt_term : rxvt_vars { 822struct rxvt_term : rxvt_vars {
831 struct mbstate mbstate; 823 struct mbstate mbstate;
832 824
… …
867#endif 859#endif
868 scrollbar_align, 860 scrollbar_align,
869 selection_wait, 861 selection_wait,
870 selection_type; 862 selection_type;
871/* ---------- */ 863/* ---------- */
872#ifdef GREEK_SUPPORT
873 short greek_mode; /* greek keyboard mode */
874#endif
875 short rvideo; 864 short rvideo;
876 int16_t num_scr; /* screen: number lines scrolled */ 865 int16_t num_scr; /* screen: number lines scrolled */
877 unsigned int prev_ncol, /* screen: previous number of columns */ 866 unsigned int prev_ncol, /* screen: previous number of columns */
878 prev_nrow; /* screen: previous number of rows */ 867 prev_nrow; /* screen: previous number of rows */
879#ifdef RXVT_GRAPHICS
880 uint16_t gr_prev_start;
881#endif
882/* ---------- */ 868/* ---------- */
883 rend_t rstyle; 869 rend_t rstyle;
884/* ---------- */ 870/* ---------- */
885 uint32_t pixcolor_set[NPIXCLR_SETS]; 871 uint32_t pixcolor_set[NPIXCLR_SETS];
886/* ---------- */ 872/* ---------- */
… …
988 const char *key_delete; 974 const char *key_delete;
989#endif 975#endif
990#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 976#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
991 KeySym ks_bigfont, ks_smallfont; 977 KeySym ks_bigfont, ks_smallfont;
992#endif 978#endif
993#ifdef GREEK_SUPPORT
994 KeySym ks_greekmodeswith;
995#endif
996#ifdef USE_XIM 979#ifdef USE_XIM
997 rxvt_xim *input_method; 980 rxvt_xim *input_method;
998 XIC Input_Context; 981 XIC Input_Context;
999 XIMStyle input_style; 982 XIMStyle input_style;
1000 int event_type; 983 int event_type;
1001#endif 984#endif
1002 struct mouse_event MEvent; 985 struct mouse_event MEvent;
1003 XComposeStatus compose; 986 XComposeStatus compose;
1004#ifdef RXVT_GRAPHICS
1005 int graphics_up;
1006 struct grwin_t *gr_root;
1007#endif
1008 ttymode_t tio; 987 ttymode_t tio;
1009#ifdef UTMP_SUPPORT 988#ifdef UTMP_SUPPORT
1010# ifdef HAVE_STRUCT_UTMP 989# ifdef HAVE_STRUCT_UTMP
1011 struct utmp ut; 990 struct utmp ut;
1012# endif 991# endif
… …
1021 row_col_t oldcursor; 1000 row_col_t oldcursor;
1022#ifdef XPM_BACKGROUND 1001#ifdef XPM_BACKGROUND
1023 bgPixmap_t bgPixmap; 1002 bgPixmap_t bgPixmap;
1024 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1003 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1025#endif 1004#endif
1026#ifdef MULTICHAR_SET
1027 int oldcursormulti;
1028 void (*multichar_decode) (unsigned char *str, int len);
1029#endif
1030#ifndef RESET_TTY_TO_COMMON_DEFAULTS 1005#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1031 struct stat ttyfd_stat; /* original status of our tty */ 1006 struct stat ttyfd_stat; /* original status of our tty */
1032#endif 1007#endif
1033#ifdef MENUBAR 1008#ifdef MENUBAR
1034 menu_t *ActiveMenu, /* currently active menu */ 1009 menu_t *ActiveMenu, /* currently active menu */
1035 *BuildMenu; /* the menu currently being built */ 1010 *BuildMenu; /* the menu currently being built */
1036 bar_t *CurrentBar; 1011 bar_t *CurrentBar;
1037# if ! (MENUBAR_MAX > 1) 1012# if ! (MENUBAR_MAX > 1)
1038 bar_t BarList; 1013 bar_t BarList;
1039# endif /* (MENUBAR_MAX > 1) */ 1014# endif /* (MENUBAR_MAX > 1) */
1040#endif
1041#ifdef RXVT_GRAPHICS
1042 Window gr_last_id;
1043#endif 1015#endif
1044#ifdef CURSOR_BLINK 1016#ifdef CURSOR_BLINK
1045 struct timeval lastcursorchange; 1017 struct timeval lastcursorchange;
1046#endif 1018#endif
1047#ifdef POINTER_BLANK 1019#ifdef POINTER_BLANK

Diff Legend

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