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.246 by root, Sat Jan 28 20:33:31 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
… …
509 Rxvt_restoreFG = 39, // change default fg color 510 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 511 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 513
513 URxvt_locale = 701, // change locale 514 URxvt_locale = 701, // change locale
515 URxvt_version = 702, // request version
514 516
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 517 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 518 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 519 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 520 URxvt_Color_UL = 707,
… …
616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 618# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
617# include "rsinc.h" 619# include "rsinc.h"
618# undef def 620# undef def
619# undef reserve 621# undef reserve
620 NUM_RESOURCES 622 NUM_RESOURCES
621};
622
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}; 623};
658 624
659/* DEC private modes */ 625/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 626#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 627#define PrivMode_132OK (1UL<<1)
… …
734 ***************************************************************************** 700 *****************************************************************************
735 * MACRO DEFINES 701 * MACRO DEFINES
736 ***************************************************************************** 702 *****************************************************************************
737 */ 703 */
738#define dLocal(type,name) type const name = this->name 704#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 705
706// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicode combining character
708// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
740 710
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
821 791
822#ifdef XPM_BACKGROUND 792#ifdef XPM_BACKGROUND
823# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 793# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
824#else 794#else
825# define XPMClearArea(a, b, c, d, e, f, g) 795# define XPMClearArea(a, b, c, d, e, f, g)
826#endif
827
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 796#endif
848 797
849typedef callback1<void, const char *> log_callback; 798typedef callback1<void, const char *> log_callback;
850typedef callback1<int, int> getfd_callback; 799typedef callback1<int, int> getfd_callback;
851 800
… …
962 911
963#ifdef KEYSYM_RESOURCE 912#ifdef KEYSYM_RESOURCE
964 class keyboard_manager; 913 class keyboard_manager;
965#endif 914#endif
966 915
967struct rxvt_term : zero_initialized, rxvt_vars { 916struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
968 log_callback *log_hook; // log error messages through this hook, if != 0 917 log_callback *log_hook; // log error messages through this hook, if != 0
969 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
970#if ENABLE_PERL 919#if ENABLE_PERL
971 rxvt_perl_term perl; 920 rxvt_perl_term perl;
972#endif 921#endif
… …
1050 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1051 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1052 unsigned long priv_modes, 1001 unsigned long priv_modes,
1053 SavedModes; 1002 SavedModes;
1054/* ---------- */ 1003/* ---------- */
1055 Atom xa[NUM_XA]; 1004 Atom *xa;
1056/* ---------- */ 1005/* ---------- */
1057#ifdef RXVT_SCROLLBAR 1006#ifdef RXVT_SCROLLBAR
1058 GC scrollbarGC, 1007 GC scrollbarGC,
1059 topShadowGC, 1008 topShadowGC,
1060 botShadowGC; 1009 botShadowGC;
… …
1117 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1066 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1118#endif 1067#endif
1119 1068
1120 vector<void *> allocated; // free these memory blocks with free() 1069 vector<void *> allocated; // free these memory blocks with free()
1121 1070
1122 char *env_windowid; /* environmental variable WINDOWID */ 1071 char env_windowid[21]; /* environmental variable WINDOWID */
1072 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1123 char *env_display; /* environmental variable DISPLAY */ 1073 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1074 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1075
1126 char *locale; 1076 char *locale;
1127 char charsets[4]; 1077 char charsets[4];
1128 char *v_buffer; /* pointer to physical buffer */ 1078 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1079 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1080 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1131 1081
1132#ifdef KEYSYM_RESOURCE 1082#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1083 keyboard_manager *keyboard;
1134#endif 1084#endif
1135 1085
… …
1157#endif 1107#endif
1158 1108
1159 // modifies first argument(!) 1109 // modifies first argument(!)
1160 void paste (char *data, unsigned int len) NOTHROW; 1110 void paste (char *data, unsigned int len) NOTHROW;
1161 1111
1162 long vt_emask, vt_emask_perl; 1112 long vt_emask, vt_emask_perl, vt_emask_xim;
1163 1113
1164 void vt_select_input () const NOTHROW 1114 void vt_select_input () const NOTHROW
1165 { 1115 {
1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1116 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1167 } 1117 }
1168 1118
1169#if TRANSPARENT 1119#if TRANSPARENT
1170 void rootwin_cb (XEvent &xev); 1120 void rootwin_cb (XEvent &xev);
1171 xevent_watcher rootwin_ev; 1121 xevent_watcher rootwin_ev;
… …
1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1329 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1279 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1330 1280
1331 // screen.C 1281 // screen.C
1332 1282
1333 void lalloc (line_t &l) const NOTHROW 1283 void lalloc (line_t &l) const
1334 { 1284 {
1335 l.t = (text_t *)talloc->alloc (); 1285 l.t = (text_t *)talloc->alloc ();
1336 l.r = (rend_t *)ralloc->alloc (); 1286 l.r = (rend_t *)ralloc->alloc ();
1337 } 1287 }
1338 1288
… …
1342 talloc->free (l.t); 1292 talloc->free (l.t);
1343 ralloc->free (l.r); 1293 ralloc->free (l.r);
1344 } 1294 }
1345#endif 1295#endif
1346 1296
1347 void lresize (line_t &l) const NOTHROW 1297 void lresize (line_t &l) const
1348 { 1298 {
1349 if (!l.t) 1299 if (!l.t)
1350 return; 1300 return;
1351 1301
1352 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1302 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1420 void scr_remap_chars () NOTHROW; 1370 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1371 void scr_remap_chars (line_t &l) NOTHROW;
1422 1372
1423 enum cursor_mode { SAVE, RESTORE }; 1373 enum cursor_mode { SAVE, RESTORE };
1424 1374
1425 void scr_poweron () NOTHROW; 1375 void scr_poweron ();
1426 void scr_cursor (cursor_mode mode) NOTHROW; 1376 void scr_cursor (cursor_mode mode) NOTHROW;
1427 void scr_do_wrap () NOTHROW; 1377 void scr_do_wrap () NOTHROW;
1378 void scr_swap_screen () NOTHROW;
1428 int scr_change_screen (int scrn) NOTHROW; 1379 void scr_change_screen (int scrn);
1429 void scr_color (unsigned int color, int fgbg) NOTHROW; 1380 void scr_color (unsigned int color, int fgbg) NOTHROW;
1430 void scr_rendition (int set, int style) NOTHROW; 1381 void scr_rendition (int set, int style) NOTHROW;
1431 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1382 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1432 void scr_backspace () NOTHROW; 1383 void scr_backspace () NOTHROW;
1433 void scr_tab (int count, bool ht = false) NOTHROW; 1384 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1525# define __PROTO(p) p 1476# define __PROTO(p) p
1526#else 1477#else
1527# define __PROTO(p) () 1478# define __PROTO(p) ()
1528#endif 1479#endif
1529 1480
1530#ifdef DEBUG_malloc
1531# include "dmalloc.h" /* This comes last */
1532#endif
1533
1534#endif /* _RXVT_H_ */ 1481#endif /* _RXVT_H_ */
1535 1482

Diff Legend

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