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.236 by root, Sun Jan 22 17:10:01 2006 UTC vs.
Revision 1.250 by root, Tue Jan 31 01:21:21 2006 UTC

… …
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
21#else 22#else
22# define ENABLE_MINIMAL 1 23# define ENABLE_MINIMAL 1
23#endif 24#endif
24 25
… …
31#if ENABLE_FRILLS 32#if ENABLE_FRILLS
32# include <X11/Xmd.h> 33# include <X11/Xmd.h>
33#endif 34#endif
34 35
35#include "encoding.h" 36#include "encoding.h"
37#include "rxvtutil.h"
36#include "rxvtfont.h" 38#include "rxvtfont.h"
37#include "rxvttoolkit.h" 39#include "rxvttoolkit.h"
38#include "iom.h" 40#include "iom.h"
39#include "salloc.h" 41#include "salloc.h"
40#include "libptytty.h" 42#include "libptytty.h"
… …
96# define STDOUT_FILENO 1 98# define STDOUT_FILENO 1
97# define STDERR_FILENO 2 99# define STDERR_FILENO 2
98#endif 100#endif
99 101
100/****************************************************************************/ 102/****************************************************************************/
101
102#ifndef __attribute__
103# if __GNUC__
104# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
105# define __attribute__(x)
106# endif
107# endif
108# define __attribute__(x)
109#endif
110
111#define NORETURN __attribute__ ((noreturn))
112#define UNUSED __attribute__ ((unused))
113
114// increases code size unless -fno-enforce-eh-specs
115#if __GNUC__
116# define NOTHROW
117# define THROW(x)
118#else
119# define NOTHROW throw()
120# define THROW(x) throw x
121#endif
122 103
123// exception thrown on fatal (per-instance) errors 104// exception thrown on fatal (per-instance) errors
124class rxvt_failure_exception { }; 105class rxvt_failure_exception { };
125 106
126// exception thrown when the command parser runs out of input data 107// exception thrown when the command parser runs out of input data
… …
431// fake styles 412// fake styles
432#define RS_Blink 0x00010000UL // blink 413#define RS_Blink 0x00010000UL // blink
433#define RS_RVid 0x00020000UL // reverse video 414#define RS_RVid 0x00020000UL // reverse video
434#define RS_Uline 0x00040000UL // underline 415#define RS_Uline 0x00040000UL // underline
435 416
417// toggle this to force redraw, must be != RS_Careful
418#define RS_redraw 0x01000000UL
419
436// 5 custom bits for extensions 420// 5 custom bits for extensions
437#define RS_customCount 32 421#define RS_customCount 32
438#define RS_customMask 0x00f80000UL 422#define RS_customMask 0x00f80000UL
439#define RS_customShift 19 423#define RS_customShift 19
440 424
… …
509 Rxvt_restoreFG = 39, // change default fg color 493 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 494 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 495 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 496
513 URxvt_locale = 701, // change locale 497 URxvt_locale = 701, // change locale
498 URxvt_version = 702, // request version
514 499
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 500 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 501 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 502 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 503 URxvt_Color_UL = 707,
… …
618# undef def 603# undef def
619# undef reserve 604# undef reserve
620 NUM_RESOURCES 605 NUM_RESOURCES
621}; 606};
622 607
623// see init.C:xa_names, which must be kept in sync
624enum {
625 XA_TEXT = 0,
626 XA_COMPOUND_TEXT,
627 XA_UTF8_STRING,
628 XA_MULTIPLE,
629 XA_TARGETS,
630 XA_TIMESTAMP,
631 XA_VT_SELECTION,
632 XA_INCR,
633 XA_WM_PROTOCOLS,
634 XA_WM_DELETE_WINDOW,
635 XA_CLIPBOARD,
636#if ENABLE_FRILLS
637 XA_MOTIF_WM_HINTS,
638#endif
639#if ENABLE_EWMH
640 XA_NET_WM_PID,
641 XA_NET_WM_NAME,
642 XA_NET_WM_ICON_NAME,
643 XA_NET_WM_PING,
644#endif
645#if USE_XIM
646 XA_WM_LOCALE_NAME,
647#endif
648#if TRANSPARENT
649 XA_XROOTPMAP_ID,
650 XA_ESETROOT_PMAP_ID,
651#endif
652#if ENABLE_XEMBED
653 XA_XEMBED,
654 XA_XEMBED_INFO,
655#endif
656 NUM_XA
657};
658
659/* DEC private modes */ 608/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 609#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 610#define PrivMode_132OK (1UL<<1)
662#define PrivMode_rVideo (1UL<<2) 611#define PrivMode_rVideo (1UL<<2)
663#define PrivMode_relOrigin (1UL<<3) 612#define PrivMode_relOrigin (1UL<<3)
… …
734 ***************************************************************************** 683 *****************************************************************************
735 * MACRO DEFINES 684 * MACRO DEFINES
736 ***************************************************************************** 685 *****************************************************************************
737 */ 686 */
738#define dLocal(type,name) type const name = this->name 687#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 688
689// for speed reasons, we assume that all latin1 characters
690// are single-width (the first unicode combining character
691// is actually 0x300, but ascii is what matters most).
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
740 693
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
823# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
824#else 777#else
825# define XPMClearArea(a, b, c, d, e, f, g) 778# define XPMClearArea(a, b, c, d, e, f, g)
826#endif 779#endif
827 780
828#ifdef DEBUG_CMD
829# define D_CMD(x) fprintf x ; fputc('\n', stderr)
830#else
831# define D_CMD(x)
832#endif
833#ifdef DEBUG_INIT
834# define D_INIT(x) fprintf x ; fputc('\n', stderr)
835#else
836# define D_INIT(x)
837#endif
838#ifdef DEBUG_MAIN
839# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
840#else
841# define D_MAIN(x)
842#endif
843#ifdef DEBUG_SIZE
844# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
845#else
846# define D_SIZE(x)
847#endif
848
849typedef callback1<void, const char *> log_callback; 781typedef callback1<void, const char *> log_callback;
850typedef callback1<int, int> getfd_callback; 782typedef callback1<int, int> getfd_callback;
851 783
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 784#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale) NOTHROW; 785extern bool rxvt_set_locale (const char *locale) NOTHROW;
… …
920# define COMPOSE_LO 0x40000000UL 852# define COMPOSE_LO 0x40000000UL
921# define COMPOSE_HI 0x400fffffUL 853# define COMPOSE_HI 0x400fffffUL
922# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
923#else 855#else
924# if ENABLE_PERL 856# if ENABLE_PERL
925# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 857# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
926# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 858# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
927# else 859# else
928# define COMPOSE_LO 0xd800UL 860# define COMPOSE_LO 0xd800UL
929# define COMPOSE_HI 0xf8ffUL 861# define COMPOSE_HI 0xf8ffUL
930# endif 862# endif
… …
962 894
963#ifdef KEYSYM_RESOURCE 895#ifdef KEYSYM_RESOURCE
964 class keyboard_manager; 896 class keyboard_manager;
965#endif 897#endif
966 898
967struct rxvt_term : zero_initialized, rxvt_vars { 899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
968 log_callback *log_hook; // log error messages through this hook, if != 0 900 log_callback *log_hook; // log error messages through this hook, if != 0
969 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
970#if ENABLE_PERL 902#if ENABLE_PERL
971 rxvt_perl_term perl; 903 rxvt_perl_term perl;
972#endif 904#endif
… …
1050 int old_width, /* last used width in screen resize */ 982 int old_width, /* last used width in screen resize */
1051 old_height; /* last used height in screen resize */ 983 old_height; /* last used height in screen resize */
1052 unsigned long priv_modes, 984 unsigned long priv_modes,
1053 SavedModes; 985 SavedModes;
1054/* ---------- */ 986/* ---------- */
1055 Atom xa[NUM_XA]; 987 Atom *xa;
1056/* ---------- */ 988/* ---------- */
1057#ifdef RXVT_SCROLLBAR 989#ifdef RXVT_SCROLLBAR
1058 GC scrollbarGC, 990 GC scrollbarGC,
1059 topShadowGC, 991 topShadowGC,
1060 botShadowGC; 992 botShadowGC;
… …
1117 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1049 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1118#endif 1050#endif
1119 1051
1120 vector<void *> allocated; // free these memory blocks with free() 1052 vector<void *> allocated; // free these memory blocks with free()
1121 1053
1122 char *env_windowid; /* environmental variable WINDOWID */ 1054 char env_windowid[21]; /* environmental variable WINDOWID */
1055 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1123 char *env_display; /* environmental variable DISPLAY */ 1056 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1057 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1058
1126 char *locale; 1059 char *locale;
1127 char charsets[4]; 1060 char charsets[4];
1128 char *v_buffer; /* pointer to physical buffer */ 1061 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1062 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1063 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1131 1064
1132#ifdef KEYSYM_RESOURCE 1065#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1066 keyboard_manager *keyboard;
1134#endif 1067#endif
1135 1068
… …
1157#endif 1090#endif
1158 1091
1159 // modifies first argument(!) 1092 // modifies first argument(!)
1160 void paste (char *data, unsigned int len) NOTHROW; 1093 void paste (char *data, unsigned int len) NOTHROW;
1161 1094
1162 long vt_emask, vt_emask_perl; 1095 long vt_emask, vt_emask_perl, vt_emask_xim;
1163 1096
1164 void vt_select_input () const NOTHROW 1097 void vt_select_input () const NOTHROW
1165 { 1098 {
1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1167 } 1100 }
1168 1101
1169#if TRANSPARENT 1102#if TRANSPARENT
1170 void rootwin_cb (XEvent &xev); 1103 void rootwin_cb (XEvent &xev);
1171 xevent_watcher rootwin_ev; 1104 xevent_watcher rootwin_ev;
… …
1323 void set_utf8_property (Atom prop, const char *str, int len = -1); 1256 void set_utf8_property (Atom prop, const char *str, int len = -1);
1324 void set_title (const char *str); 1257 void set_title (const char *str);
1325 void set_icon_name (const char *str); 1258 void set_icon_name (const char *str);
1326 void set_window_color (int idx, const char *color); 1259 void set_window_color (int idx, const char *color);
1327 void set_colorfgbg (); 1260 void set_colorfgbg ();
1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1261 bool set_color (rxvt_color &color, const char *name);
1329 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1262 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1330 1263
1331 // screen.C 1264 // screen.C
1332 1265
1333 void lalloc (line_t &l) const NOTHROW 1266 void lalloc (line_t &l) const
1334 { 1267 {
1335 l.t = (text_t *)talloc->alloc (); 1268 l.t = (text_t *)talloc->alloc ();
1336 l.r = (rend_t *)ralloc->alloc (); 1269 l.r = (rend_t *)ralloc->alloc ();
1337 } 1270 }
1338 1271
… …
1342 talloc->free (l.t); 1275 talloc->free (l.t);
1343 ralloc->free (l.r); 1276 ralloc->free (l.r);
1344 } 1277 }
1345#endif 1278#endif
1346 1279
1347 void lresize (line_t &l) const NOTHROW 1280 void lresize (line_t &l) const
1348 { 1281 {
1349 if (!l.t) 1282 if (!l.t)
1350 return; 1283 return;
1351 1284
1352 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1285 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1420 void scr_remap_chars () NOTHROW; 1353 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1354 void scr_remap_chars (line_t &l) NOTHROW;
1422 1355
1423 enum cursor_mode { SAVE, RESTORE }; 1356 enum cursor_mode { SAVE, RESTORE };
1424 1357
1425 void scr_poweron () NOTHROW; 1358 void scr_poweron ();
1426 void scr_cursor (cursor_mode mode) NOTHROW; 1359 void scr_cursor (cursor_mode mode) NOTHROW;
1427 void scr_do_wrap () NOTHROW; 1360 void scr_do_wrap () NOTHROW;
1361 void scr_swap_screen () NOTHROW;
1428 int scr_change_screen (int scrn) NOTHROW; 1362 void scr_change_screen (int scrn);
1429 void scr_color (unsigned int color, int fgbg) NOTHROW; 1363 void scr_color (unsigned int color, int fgbg) NOTHROW;
1430 void scr_rendition (int set, int style) NOTHROW; 1364 void scr_rendition (int set, int style) NOTHROW;
1431 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1365 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1432 void scr_backspace () NOTHROW; 1366 void scr_backspace () NOTHROW;
1433 void scr_tab (int count, bool ht = false) NOTHROW; 1367 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1525# define __PROTO(p) p 1459# define __PROTO(p) p
1526#else 1460#else
1527# define __PROTO(p) () 1461# define __PROTO(p) ()
1528#endif 1462#endif
1529 1463
1530#ifdef DEBUG_malloc
1531# include "dmalloc.h" /* This comes last */
1532#endif
1533
1534#endif /* _RXVT_H_ */ 1464#endif /* _RXVT_H_ */
1535 1465

Diff Legend

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