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.410 by sf-exg, Mon Jul 19 16:43:21 2010 UTC vs.
Revision 1.425 by sf-exg, Tue Dec 21 12:20:20 2010 UTC

… …
189#else 189#else
190 if (envv) 190 if (envv)
191#endif 191#endif
192 environ = envv; 192 environ = envv;
193} 193}
194
195struct localise_env
196{
197 char **orig_env;
198
199 localise_env (char **new_env)
200 {
201 orig_env = environ;
202 environ = new_env;
203 }
204
205 ~localise_env ()
206 {
207 environ = orig_env;
208 }
209};
194 210
195/* 211/*
196 ***************************************************************************** 212 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 213 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 214 *****************************************************************************
… …
555#define PrivMode_vt52 (1UL<<18) 571#define PrivMode_vt52 (1UL<<18)
556#define PrivMode_LFNL (1UL<<19) 572#define PrivMode_LFNL (1UL<<19)
557#define PrivMode_MouseBtnEvent (1UL<<20) 573#define PrivMode_MouseBtnEvent (1UL<<20)
558#define PrivMode_MouseAnyEvent (1UL<<21) 574#define PrivMode_MouseAnyEvent (1UL<<21)
559#define PrivMode_BracketPaste (1UL<<22) 575#define PrivMode_BracketPaste (1UL<<22)
576#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
577#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
560 578
561#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 579#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
562 580
563#ifdef ALLOW_132_MODE 581#ifdef ALLOW_132_MODE
564# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 582# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
807{ 825{
808 int x, y, w, h; // overlay dimensions 826 int x, y, w, h; // overlay dimensions
809 text_t **text; 827 text_t **text;
810 rend_t **rend; 828 rend_t **rend;
811 829
812 // while tempting to add swap() etc. here, it effetcively only increases code size 830 // while tempting to add swap() etc. here, it effectively only increases code size
813}; 831};
814 832
815/* ------------------------------------------------------------------------- */ 833/* ------------------------------------------------------------------------- */
816 834
817typedef struct 835typedef struct
… …
949#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 967#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
950#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 968#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
951 969
952/* rxvt_vars.options */ 970/* rxvt_vars.options */
953enum { 971enum {
954# define def(name,idx) Opt_ ## name = idx,
955# define nodef(name) Opt_ ## name = 0, 972# define def(name) Opt_ ## name,
973# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
974 Opt_0,
956# include "optinc.h" 975# include "optinc.h"
957# undef nodef 976# undef nodef
958# undef def 977# undef def
959Opt_count 978 Opt_count
960}; 979};
961 980
962/* ------------------------------------------------------------------------- */ 981/* ------------------------------------------------------------------------- */
963 982
964struct rxvt_vars : TermWin_t 983struct rxvt_vars : TermWin_t
… …
1074 char * incr_buf; 1093 char * incr_buf;
1075 size_t incr_buf_size, incr_buf_fill; 1094 size_t incr_buf_size, incr_buf_fill;
1076/* ---------- */ 1095/* ---------- */
1077 struct mouse_event MEvent; 1096 struct mouse_event MEvent;
1078 XComposeStatus compose; 1097 XComposeStatus compose;
1079 struct termios tio; 1098 static struct termios def_tio;
1080 row_col_t oldcursor; 1099 row_col_t oldcursor;
1081#ifdef HAVE_BG_PIXMAP 1100#ifdef HAVE_BG_PIXMAP
1082 bgPixmap_t bgPixmap; 1101 bgPixmap_t bgPixmap;
1083#endif 1102#endif
1084#ifdef HAVE_AFTERIMAGE 1103#ifdef HAVE_AFTERIMAGE
… …
1158 void rootwin_cb (XEvent &xev); 1177 void rootwin_cb (XEvent &xev);
1159 xevent_watcher rootwin_ev; 1178 xevent_watcher rootwin_ev;
1160#endif 1179#endif
1161#ifdef HAVE_BG_PIXMAP 1180#ifdef HAVE_BG_PIXMAP
1162 void update_background (); 1181 void update_background ();
1163#if TRACE_PIXMAPS
1164 void trace_update_background (const char *file, int line);
1165# define update_background() trace_update_background (__FILE__, __LINE__)
1166#endif
1167 void update_background_cb (ev::timer &w, int revents); 1182 void update_background_cb (ev::timer &w, int revents);
1168 ev::timer update_background_ev; 1183 ev::timer update_background_ev;
1169#endif 1184#endif
1170 1185
1171 void x_cb (XEvent &xev); 1186 void x_cb (XEvent &xev);
… …
1297 int run_child (const char *const *argv); 1312 int run_child (const char *const *argv);
1298 void color_aliases (int idx); 1313 void color_aliases (int idx);
1299 void create_windows (int argc, const char *const *argv); 1314 void create_windows (int argc, const char *const *argv);
1300 void get_colours (); 1315 void get_colours ();
1301 void get_ourmods (); 1316 void get_ourmods ();
1317 void set_icon (const char *file);
1302 // main.C 1318 // main.C
1303 void tt_winch (); 1319 void tt_winch ();
1304 rxvt_term (); 1320 rxvt_term ();
1305 ~rxvt_term (); 1321 ~rxvt_term ();
1306 void destroy (); 1322 void destroy ();
… …
1318 void set_colorfgbg (); 1334 void set_colorfgbg ();
1319 bool set_color (rxvt_color &color, const char *name); 1335 bool set_color (rxvt_color &color, const char *name);
1320 void alias_color (int dst, int src); 1336 void alias_color (int dst, int src);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1337 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 void get_window_origin (int &x, int &y); 1338 void get_window_origin (int &x, int &y);
1323 Pixmap get_pixmap_property (int prop_id); 1339 Pixmap get_pixmap_property (Atom property);
1324 1340
1325 // screen.C 1341 // screen.C
1326 1342
1327 void lalloc (line_t &l) const 1343 void lalloc (line_t &l) const
1328 { 1344 {
… …
1380 return base; 1396 return base;
1381 } 1397 }
1382 1398
1383 bool option (uint8_t opt) const NOTHROW 1399 bool option (uint8_t opt) const NOTHROW
1384 { 1400 {
1385 if (!opt)
1386 return 0;
1387
1388 --opt;
1389 return options[opt >> 3] & (1 << (opt & 7)); 1401 return options[opt >> 3] & (1 << (opt & 7));
1390 } 1402 }
1391 1403
1392 void set_option (uint8_t opt, bool set = true) NOTHROW 1404 void set_option (uint8_t opt, bool set = true) NOTHROW;
1393 {
1394 if (!opt)
1395 return;
1396
1397 --opt;
1398 if (set)
1399 options[opt >> 3] |= (1 << (opt & 7));
1400 else
1401 options[opt >> 3] &= ~(1 << (opt & 7));
1402 }
1403 1405
1404 void set_privmode (unsigned bit, int set) NOTHROW 1406 void set_privmode (unsigned bit, int set) NOTHROW
1405 { 1407 {
1406 if (set) 1408 if (set)
1407 priv_modes |= bit; 1409 priv_modes |= bit;
1408 else 1410 else
1409 priv_modes &= ~bit; 1411 priv_modes &= ~bit;
1410 } 1412 }
1411 1413
1412 // modifies first argument(!) 1414 // modifies first argument(!)
1415 void tt_paste (char *data, unsigned int len) NOTHROW;
1413 void paste (char *data, unsigned int len) NOTHROW; 1416 void paste (char *data, unsigned int len) NOTHROW;
1414 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1417 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1415 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1418 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1416 void scr_kill_char (line_t &l, int col) const NOTHROW; 1419 void scr_kill_char (line_t &l, int col) const NOTHROW;
1417 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1420 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1479 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1477 void selection_property (Window win, Atom prop) NOTHROW; 1480 void selection_property (Window win, Atom prop) NOTHROW;
1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1481 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1479 int selection_request_other (Atom target, int selnum) NOTHROW; 1482 int selection_request_other (Atom target, int selnum) NOTHROW;
1480 void selection_clear (bool clipboard = false) NOTHROW; 1483 void selection_clear (bool clipboard = false) NOTHROW;
1481 void clipboard_copy (Time tm);
1482 void selection_make (Time tm); 1484 void selection_make (Time tm);
1483 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1485 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1484 void selection_start_colrow (int col, int row) NOTHROW; 1486 void selection_start_colrow (int col, int row) NOTHROW;
1485 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1487 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1486 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1488 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;

Diff Legend

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