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.38 by pcg, Sun Feb 22 08:28:36 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>
… …
370#define XTerm_font 50 367#define XTerm_font 50
371 368
372/* 369/*
373 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 370 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
374 */ 371 */
372#define XTerm_locale 9 /* change locale */
375#define XTerm_Menu 10 /* set menu item */ 373#define XTerm_Menu 10 /* set menu item */
376#define XTerm_Pixmap 20 /* new bg pixmap */ 374#define XTerm_Pixmap 20 /* new bg pixmap */
377#define XTerm_restoreFG 39 /* change default fg color */ 375#define XTerm_restoreFG 39 /* change default fg color */
378#define XTerm_restoreBG 49 /* change default bg color */ 376#define XTerm_restoreBG 49 /* change default bg color */
379#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */ 377#define XTerm_dumpscreen 55 /* dump scrollback and all of screen */
… …
473 Rs_backgroundPixmap, 471 Rs_backgroundPixmap,
474#endif 472#endif
475#if (MENUBAR_MAX) 473#if (MENUBAR_MAX)
476 Rs_menu, 474 Rs_menu,
477#endif 475#endif
478#ifdef GREEK_SUPPORT
479 Rs_greek_keyboard,
480 Rs_greektoggle_key,
481#endif
482 Rs_loginShell, 476 Rs_loginShell,
483 Rs_jumpScroll, 477 Rs_jumpScroll,
484#ifdef HAVE_SCROLLBARS 478#ifdef HAVE_SCROLLBARS
485 Rs_scrollBar, 479 Rs_scrollBar,
486 Rs_scrollBar_right, 480 Rs_scrollBar_right,
… …
819 813
820// primivite wrapper around mbstate_t to ensure initialisation 814// primivite wrapper around mbstate_t to ensure initialisation
821struct mbstate { 815struct mbstate {
822 mbstate_t mbs; 816 mbstate_t mbs;
823 817
824 mbstate () 818 operator mbstate_t *() { return &mbs; }
825 {
826 MEMSET (&mbs, 0, sizeof (mbs)); 819 void reset () { MEMSET (&mbs, 0, sizeof (mbs)); }
827 } 820 mbstate () { reset (); }
828}; 821};
829 822
830struct rxvt_term : rxvt_vars { 823struct rxvt_term : rxvt_vars {
831 struct mbstate mbstate; 824 struct mbstate mbstate;
832 825
… …
867#endif 860#endif
868 scrollbar_align, 861 scrollbar_align,
869 selection_wait, 862 selection_wait,
870 selection_type; 863 selection_type;
871/* ---------- */ 864/* ---------- */
872#ifdef GREEK_SUPPORT
873 short greek_mode; /* greek keyboard mode */
874#endif
875 short rvideo; 865 short rvideo;
876 int16_t num_scr; /* screen: number lines scrolled */ 866 int16_t num_scr; /* screen: number lines scrolled */
877 unsigned int prev_ncol, /* screen: previous number of columns */ 867 unsigned int prev_ncol, /* screen: previous number of columns */
878 prev_nrow; /* screen: previous number of rows */ 868 prev_nrow; /* screen: previous number of rows */
879#ifdef RXVT_GRAPHICS
880 uint16_t gr_prev_start;
881#endif
882/* ---------- */ 869/* ---------- */
883 rend_t rstyle; 870 rend_t rstyle;
884/* ---------- */ 871/* ---------- */
885 uint32_t pixcolor_set[NPIXCLR_SETS]; 872 uint32_t pixcolor_set[NPIXCLR_SETS];
886/* ---------- */ 873/* ---------- */
… …
988 const char *key_delete; 975 const char *key_delete;
989#endif 976#endif
990#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 977#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
991 KeySym ks_bigfont, ks_smallfont; 978 KeySym ks_bigfont, ks_smallfont;
992#endif 979#endif
993#ifdef GREEK_SUPPORT
994 KeySym ks_greekmodeswith;
995#endif
996#ifdef USE_XIM 980#ifdef USE_XIM
997 rxvt_xim *input_method; 981 rxvt_xim *input_method;
998 XIC Input_Context; 982 XIC Input_Context;
999 XIMStyle input_style; 983 XIMStyle input_style;
1000 int event_type; 984 int event_type;
1001#endif 985#endif
1002 struct mouse_event MEvent; 986 struct mouse_event MEvent;
1003 XComposeStatus compose; 987 XComposeStatus compose;
1004#ifdef RXVT_GRAPHICS
1005 int graphics_up;
1006 struct grwin_t *gr_root;
1007#endif
1008 ttymode_t tio; 988 ttymode_t tio;
1009#ifdef UTMP_SUPPORT 989#ifdef UTMP_SUPPORT
1010# ifdef HAVE_STRUCT_UTMP 990# ifdef HAVE_STRUCT_UTMP
1011 struct utmp ut; 991 struct utmp ut;
1012# endif 992# endif
… …
1021 row_col_t oldcursor; 1001 row_col_t oldcursor;
1022#ifdef XPM_BACKGROUND 1002#ifdef XPM_BACKGROUND
1023 bgPixmap_t bgPixmap; 1003 bgPixmap_t bgPixmap;
1024 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1004 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1025#endif 1005#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 1006#ifndef RESET_TTY_TO_COMMON_DEFAULTS
1031 struct stat ttyfd_stat; /* original status of our tty */ 1007 struct stat ttyfd_stat; /* original status of our tty */
1032#endif 1008#endif
1033#ifdef MENUBAR 1009#ifdef MENUBAR
1034 menu_t *ActiveMenu, /* currently active menu */ 1010 menu_t *ActiveMenu, /* currently active menu */
1035 *BuildMenu; /* the menu currently being built */ 1011 *BuildMenu; /* the menu currently being built */
1036 bar_t *CurrentBar; 1012 bar_t *CurrentBar;
1037# if ! (MENUBAR_MAX > 1) 1013# if ! (MENUBAR_MAX > 1)
1038 bar_t BarList; 1014 bar_t BarList;
1039# endif /* (MENUBAR_MAX > 1) */ 1015# endif /* (MENUBAR_MAX > 1) */
1040#endif
1041#ifdef RXVT_GRAPHICS
1042 Window gr_last_id;
1043#endif 1016#endif
1044#ifdef CURSOR_BLINK 1017#ifdef CURSOR_BLINK
1045 struct timeval lastcursorchange; 1018 struct timeval lastcursorchange;
1046#endif 1019#endif
1047#ifdef POINTER_BLANK 1020#ifdef POINTER_BLANK
… …
1214 void cleanutent (); 1187 void cleanutent ();
1215 // main.C; 1188 // main.C;
1216 void privileges (int mode); 1189 void privileges (int mode);
1217 void privileged_utmp (char action); 1190 void privileged_utmp (char action);
1218 void privileged_ttydev (char action); 1191 void privileged_ttydev (char action);
1219 void change_font (int init, const char *fontname); 1192 bool change_font (const char *fontname);
1220 void font_up_down (int n, int direction); 1193 bool font_up_down (int n, int direction);
1221 void set_title (const char *str); 1194 void set_title (const char *str);
1222 void set_iconName (const char *str); 1195 void set_iconName (const char *str);
1223 void set_window_color (int idx, const char *color); 1196 void set_window_color (int idx, const char *color);
1224 void set_colorfgbg (); 1197 void set_colorfgbg ();
1225 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1198 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);

Diff Legend

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