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.187 by root, Thu Jan 5 21:21:49 2006 UTC vs.
Revision 1.201 by root, Fri Jan 13 04:59:04 2006 UTC

… …
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#include "rxvtperl.h"
23 25
24#if ENABLE_FRILLS 26#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 27# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 28# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1 29# define CURSOR_BLINK 1
… …
111char * rxvt_File_find (const char *file, const char *ext, const char *path); 113char * rxvt_File_find (const char *file, const char *ext, const char *path);
112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 114void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 115void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs); 116void rxvt_usleep (int usecs);
115 117
118/////////////////////////////////////////////////////////////////////////////
119
120// temporarily replace the process environment
121extern char **environ;
122extern char **rxvt_environ; // the original environ pointer
123
124inline void set_environ (stringvec *envv)
125{
126 if (envv)
127 environ = (char **)envv->begin ();
128}
129
130inline void set_environ (char **envv)
131{
132 if (envv)
133 environ = envv;
134}
135
116/* 136/*
117 ***************************************************************************** 137 *****************************************************************************
118 * STRUCTURES AND TYPEDEFS 138 * STRUCTURES AND TYPEDEFS
119 ***************************************************************************** 139 *****************************************************************************
120 */ 140 */
… …
207# define TERMENV "rxvt-unicode" 227# define TERMENV "rxvt-unicode"
208#endif 228#endif
209 229
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 230#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 231# define NO_MOUSE_REPORT_SCROLLBAR 1
212#endif
213
214#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT
216#endif 232#endif
217 233
218#if defined (ISO_14755) || defined (ENABLE_PERL) 234#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1 235# define ENABLE_OVERLAY 1
220#endif 236#endif
… …
436 XTerm_property = 3, // change X property 452 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 453 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 454 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 455 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 456 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 457 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 458 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 459 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 460 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 461 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 462 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 463 XTerm_font = 50,
448 464
449 XTerm_konsole30 = 30, // reserved for konsole 465 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 466 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 467 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 468 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 469 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
470 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 471 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 472 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 473 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 474 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 475 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 476 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 477 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 478
462 URxvt_locale = 701, // change locale 479 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 480 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 481 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 482 URxvt_Color_tint = 705, // change actual tint colour
483 URxvt_Color_BD = 706,
484 URxvt_Color_UL = 707,
466 485
467 URxvt_font = 710, 486 URxvt_font = 710,
468 URxvt_boldFont = 711, 487 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 488 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 489 URxvt_boldItalicFont = 713,
… …
697#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 716#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
698#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 717#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
701 720
721#define OPTION(opt) (options & (opt))
722#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
723 | Opt_jumpScroll | Opt_secondaryScreen \
724 | Opt_pastableTabs | Opt_intensityStyles)
725
702// for m >= -n, ensure remainder lies between 0..n-1 726// for m >= -n, ensure remainder lies between 0..n-1
703#define MOD(m,n) (((m) + (n)) % (n)) 727#define MOD(m,n) (((m) + (n)) % (n))
704 728
705#define LINENO(n) MOD (term_start + int(n), total_rows) 729#define LINENO(n) MOD (term_start + int(n), total_rows)
706#define ROW(n) row_buf [LINENO (n)] 730#define ROW(n) row_buf [LINENO (n)]
… …
832extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 856extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
833extern void rxvt_exit_failure () __attribute__ ((noreturn)); 857extern void rxvt_exit_failure () __attribute__ ((noreturn));
834 858
835#define SET_LOCALE(locale) rxvt_set_locale (locale) 859#define SET_LOCALE(locale) rxvt_set_locale (locale)
836extern bool rxvt_set_locale (const char *locale); 860extern bool rxvt_set_locale (const char *locale);
837extern bool rxvt_push_locale (const char *locale); 861extern void rxvt_push_locale (const char *locale);
838extern void rxvt_pop_locale (); 862extern void rxvt_pop_locale ();
839 863
840/****************************************************************************/ 864/****************************************************************************/
841 865
842#ifdef MENUBAR 866#ifdef MENUBAR
… …
920#if UNICODE3 944#if UNICODE3
921# define COMPOSE_LO 0x40000000UL 945# define COMPOSE_LO 0x40000000UL
922# define COMPOSE_HI 0x400fffffUL 946# define COMPOSE_HI 0x400fffffUL
923# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 947# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
924#else 948#else
949# if ENABLE_PERL
950# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
951# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
952# else
925# define COMPOSE_LO 0xd800UL 953# define COMPOSE_LO 0xd800UL
926# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 954# define COMPOSE_HI 0xf8ffUL
927# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 955# endif
956# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
928#endif 957#endif
929 958
930#if ENABLE_COMBINING 959#if ENABLE_COMBINING
931// compose chars are used to represent composite characters 960// compose chars are used to represent composite characters
932// that are not representable in unicode, as well as characters 961// that are not representable in unicode, as well as characters
… …
959#ifdef KEYSYM_RESOURCE 988#ifdef KEYSYM_RESOURCE
960 class keyboard_manager; 989 class keyboard_manager;
961#endif 990#endif
962 991
963struct rxvt_term : zero_initialized, rxvt_vars { 992struct rxvt_term : zero_initialized, rxvt_vars {
964 log_callback *log_hook; // log error messages through this hook, if != 0 993 log_callback *log_hook; // log error messages through this hook, if != 0
965 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 994 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
966
967#if ENABLE_PERL 995#if ENABLE_PERL
968 void *self; // perl's $self 996 rxvt_perl_term perl;
969#endif 997#endif
970
971 struct mbstate mbstate; // current input multibyte state 998 struct mbstate mbstate; // current input multibyte state
972 999
973 unsigned char want_refresh:1, 1000 unsigned char want_refresh:1,
974#ifdef TRANSPARENT 1001#ifdef TRANSPARENT
975 want_full_refresh:1, /* awaiting full screen refresh */ 1002 want_full_refresh:1, /* awaiting full screen refresh */
… …
1181#endif 1208#endif
1182 1209
1183 // modifies first argument(!) 1210 // modifies first argument(!)
1184 void paste (char *data, unsigned int len); 1211 void paste (char *data, unsigned int len);
1185 1212
1186 void flush (); 1213 long vt_emask, vt_emask_perl;
1214
1215 void vt_select_input ()
1216 {
1217 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1218 }
1187 1219
1188#if TRANSPARENT 1220#if TRANSPARENT
1189 void rootwin_cb (XEvent &xev); 1221 void rootwin_cb (XEvent &xev);
1190 xevent_watcher rootwin_ev; 1222 xevent_watcher rootwin_ev;
1191#endif 1223#endif
1192 1224
1193 void x_cb (XEvent &xev); 1225 void x_cb (XEvent &xev);
1226 void flush ();
1194 xevent_watcher termwin_ev; 1227 xevent_watcher termwin_ev;
1195 xevent_watcher vt_ev; 1228 xevent_watcher vt_ev;
1196#ifdef HAVE_SCROLLBARS 1229#ifdef HAVE_SCROLLBARS
1197 xevent_watcher scrollbar_ev; 1230 xevent_watcher scrollbar_ev;
1198#endif 1231#endif
… …
1248 1281
1249 bool pty_fill (); 1282 bool pty_fill ();
1250 1283
1251 void init_secondary (); 1284 void init_secondary ();
1252 const char **init_resources (int argc, const char *const *argv); 1285 const char **init_resources (int argc, const char *const *argv);
1286 const char *x_resource (const char *name);
1253 void init_env (); 1287 void init_env ();
1254 void set_locale (const char *locale); 1288 void set_locale (const char *locale);
1255 void init_xlocale (); 1289 void init_xlocale ();
1256 void init_command (const char *const *argv); 1290 void init_command (const char *const *argv);
1257 void run_command (const char *const *argv); 1291 void run_command (const char *const *argv);
… …
1294 1328
1295 // command.C 1329 // command.C
1296 void lookup_key (XKeyEvent &ev); 1330 void lookup_key (XKeyEvent &ev);
1297 unsigned int cmd_write (const char *str, unsigned int count); 1331 unsigned int cmd_write (const char *str, unsigned int count);
1298 1332
1299 unicode_t next_char (); 1333 wchar_t next_char ();
1300 unicode_t cmd_getc (); 1334 wchar_t cmd_getc ();
1301 unicode_t next_octet (); 1335 uint32_t next_octet ();
1302 unicode_t cmd_get8 (); 1336 uint32_t cmd_get8 ();
1303 1337
1304 bool cmd_parse (); 1338 bool cmd_parse ();
1305 void mouse_report (XButtonEvent &ev); 1339 void mouse_report (XButtonEvent &ev);
1306 void button_press (XButtonEvent &ev); 1340 void button_press (XButtonEvent &ev);
1307 void button_release (XButtonEvent &ev); 1341 void button_release (XButtonEvent &ev);
… …
1434 base += minBrightCOLOR - minCOLOR; 1468 base += minBrightCOLOR - minCOLOR;
1435#endif 1469#endif
1436 return base; 1470 return base;
1437 } 1471 }
1438 1472
1473 bool option (uint32_t opt)
1474 {
1475 return OPTION (opt);
1476 }
1477
1478 void set_option (uint32_t opt, bool set)
1479 {
1480 if (set)
1481 options |= opt;
1482 else
1483 options &= ~opt;
1484 }
1485
1439 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1486 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1440 void scr_blank_screen_mem (line_t &l, rend_t efs); 1487 void scr_blank_screen_mem (line_t &l, rend_t efs);
1441 int scr_scroll_text (int row1, int row2, int count); 1488 int scr_scroll_text (int row1, int row2, int count);
1442 void scr_reset (); 1489 void scr_reset ();
1443 void scr_release (); 1490 void scr_release ();
… …
1461 void scr_cursor (int mode); 1508 void scr_cursor (int mode);
1462 void scr_do_wrap (); 1509 void scr_do_wrap ();
1463 int scr_change_screen (int scrn); 1510 int scr_change_screen (int scrn);
1464 void scr_color (unsigned int color, int fgbg); 1511 void scr_color (unsigned int color, int fgbg);
1465 void scr_rendition (int set, int style); 1512 void scr_rendition (int set, int style);
1466 void scr_add_lines (const unicode_t *str, int nlines, int len); 1513 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1467 void scr_backspace (); 1514 void scr_backspace ();
1468 void scr_tab (int count, bool ht = false); 1515 void scr_tab (int count, bool ht = false);
1469 void scr_gotorc (int row, int col, int relative); 1516 void scr_gotorc (int row, int col, int relative);
1470 void scr_index (enum page_dirn direction); 1517 void scr_index (enum page_dirn direction);
1471 void scr_erase_line (int mode); 1518 void scr_erase_line (int mode);
… …
1486 int scr_move_to (int y, int len); 1533 int scr_move_to (int y, int len);
1487 int scr_page (enum page_dirn direction, int nlines); 1534 int scr_page (enum page_dirn direction, int nlines);
1488 int scr_changeview (unsigned int oldviewstart); 1535 int scr_changeview (unsigned int oldviewstart);
1489 void scr_bell (); 1536 void scr_bell ();
1490 void scr_printscreen (int fullhist); 1537 void scr_printscreen (int fullhist);
1538 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1539 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1491 void scr_reverse_selection (); 1540 void scr_reverse_selection ();
1492 void scr_dump (int fd); 1541 void scr_dump (int fd);
1493 void selection_check (int check_more); 1542 void selection_check (int check_more);
1494 void selection_paste (Window win, Atom prop, bool delete_prop); 1543 void selection_paste (Window win, Atom prop, bool delete_prop);
1495 void selection_property (Window win, Atom prop); 1544 void selection_property (Window win, Atom prop);

Diff Legend

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