--- rxvt-unicode/src/rxvt.h 2004/02/21 20:33:40 1.36 +++ rxvt-unicode/src/rxvt.h 2004/02/22 08:28:36 1.38 @@ -51,9 +51,6 @@ } ttymode_t; #endif -#ifdef GREEK_SUPPORT -# include "grkelot.h" -#endif #ifdef XPM_BACKGROUND # ifdef XPM_INC_X11 # include @@ -372,6 +369,7 @@ /* * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) */ +#define XTerm_locale 9 /* change locale */ #define XTerm_Menu 10 /* set menu item */ #define XTerm_Pixmap 20 /* new bg pixmap */ #define XTerm_restoreFG 39 /* change default fg color */ @@ -475,10 +473,6 @@ #if (MENUBAR_MAX) Rs_menu, #endif -#ifdef GREEK_SUPPORT - Rs_greek_keyboard, - Rs_greektoggle_key, -#endif Rs_loginShell, Rs_jumpScroll, #ifdef HAVE_SCROLLBARS @@ -868,16 +862,10 @@ selection_wait, selection_type; /* ---------- */ -#ifdef GREEK_SUPPORT - short greek_mode; /* greek keyboard mode */ -#endif short rvideo; int16_t num_scr; /* screen: number lines scrolled */ unsigned int prev_ncol, /* screen: previous number of columns */ prev_nrow; /* screen: previous number of rows */ -#ifdef RXVT_GRAPHICS - uint16_t gr_prev_start; -#endif /* ---------- */ rend_t rstyle; /* ---------- */ @@ -989,9 +977,6 @@ #if defined (HOTKEY_CTRL) || defined (HOTKEY_META) KeySym ks_bigfont, ks_smallfont; #endif -#ifdef GREEK_SUPPORT - KeySym ks_greekmodeswith; -#endif #ifdef USE_XIM rxvt_xim *input_method; XIC Input_Context; @@ -1000,10 +985,6 @@ #endif struct mouse_event MEvent; XComposeStatus compose; -#ifdef RXVT_GRAPHICS - int graphics_up; - struct grwin_t *gr_root; -#endif ttymode_t tio; #ifdef UTMP_SUPPORT # ifdef HAVE_STRUCT_UTMP @@ -1022,10 +1003,6 @@ bgPixmap_t bgPixmap; XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ #endif -#ifdef MULTICHAR_SET - int oldcursormulti; - void (*multichar_decode) (unsigned char *str, int len); -#endif #ifndef RESET_TTY_TO_COMMON_DEFAULTS struct stat ttyfd_stat; /* original status of our tty */ #endif @@ -1037,9 +1014,6 @@ bar_t BarList; # endif /* (MENUBAR_MAX > 1) */ #endif -#ifdef RXVT_GRAPHICS - Window gr_last_id; -#endif #ifdef CURSOR_BLINK struct timeval lastcursorchange; #endif @@ -1215,8 +1189,8 @@ void privileges (int mode); void privileged_utmp (char action); void privileged_ttydev (char action); - void change_font (int init, const char *fontname); - void font_up_down (int n, int direction); + bool change_font (const char *fontname); + bool font_up_down (int n, int direction); void set_title (const char *str); void set_iconName (const char *str); void set_window_color (int idx, const char *color);