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.241 by root, Wed Jan 25 00:42:20 2006 UTC vs.
Revision 1.249 by root, Mon Jan 30 19:46:13 2006 UTC

… …
32#if ENABLE_FRILLS 32#if ENABLE_FRILLS
33# include <X11/Xmd.h> 33# include <X11/Xmd.h>
34#endif 34#endif
35 35
36#include "encoding.h" 36#include "encoding.h"
37#include "rxvtutil.h"
37#include "rxvtfont.h" 38#include "rxvtfont.h"
38#include "rxvttoolkit.h" 39#include "rxvttoolkit.h"
39#include "iom.h" 40#include "iom.h"
40#include "salloc.h" 41#include "salloc.h"
41#include "libptytty.h" 42#include "libptytty.h"
… …
97# define STDOUT_FILENO 1 98# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 99# define STDERR_FILENO 2
99#endif 100#endif
100 101
101/****************************************************************************/ 102/****************************************************************************/
102
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123 103
124// exception thrown on fatal (per-instance) errors 104// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 105class rxvt_failure_exception { };
126 106
127// exception thrown when the command parser runs out of input data 107// exception thrown when the command parser runs out of input data
… …
432// fake styles 412// fake styles
433#define RS_Blink 0x00010000UL // blink 413#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 414#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 415#define RS_Uline 0x00040000UL // underline
436 416
417// toggle this to force redraw, must be != RS_Careful
418#define RS_redraw 0x01000000UL
419
437// 5 custom bits for extensions 420// 5 custom bits for extensions
438#define RS_customCount 32 421#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 422#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 423#define RS_customShift 19
441 424
… …
510 Rxvt_restoreFG = 39, // change default fg color 493 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 494 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 495 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 496
514 URxvt_locale = 701, // change locale 497 URxvt_locale = 701, // change locale
498 URxvt_version = 702, // request version
515 499
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 500 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 501 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 502 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 503 URxvt_Color_UL = 707,
… …
619# undef def 603# undef def
620# undef reserve 604# undef reserve
621 NUM_RESOURCES 605 NUM_RESOURCES
622}; 606};
623 607
624// see init.C:xa_names, which must be kept in sync
625enum {
626 XA_TEXT = 0,
627 XA_COMPOUND_TEXT,
628 XA_UTF8_STRING,
629 XA_MULTIPLE,
630 XA_TARGETS,
631 XA_TIMESTAMP,
632 XA_VT_SELECTION,
633 XA_INCR,
634 XA_WM_PROTOCOLS,
635 XA_WM_DELETE_WINDOW,
636 XA_CLIPBOARD,
637#if ENABLE_FRILLS
638 XA_MOTIF_WM_HINTS,
639#endif
640#if ENABLE_EWMH
641 XA_NET_WM_PID,
642 XA_NET_WM_NAME,
643 XA_NET_WM_ICON_NAME,
644 XA_NET_WM_PING,
645#endif
646#if USE_XIM
647 XA_WM_LOCALE_NAME,
648#endif
649#if TRANSPARENT
650 XA_XROOTPMAP_ID,
651 XA_ESETROOT_PMAP_ID,
652#endif
653#if ENABLE_XEMBED
654 XA_XEMBED,
655 XA_XEMBED_INFO,
656#endif
657 NUM_XA
658};
659
660/* DEC private modes */ 608/* DEC private modes */
661#define PrivMode_132 (1UL<<0) 609#define PrivMode_132 (1UL<<0)
662#define PrivMode_132OK (1UL<<1) 610#define PrivMode_132OK (1UL<<1)
663#define PrivMode_rVideo (1UL<<2) 611#define PrivMode_rVideo (1UL<<2)
664#define PrivMode_relOrigin (1UL<<3) 612#define PrivMode_relOrigin (1UL<<3)
… …
735 ***************************************************************************** 683 *****************************************************************************
736 * MACRO DEFINES 684 * MACRO DEFINES
737 ***************************************************************************** 685 *****************************************************************************
738 */ 686 */
739#define dLocal(type,name) type const name = this->name 687#define dLocal(type,name) type const name = this->name
740#define dDisp Display *disp = this->display->display
741 688
742// for speed reasons, we assume that all latin1 characters 689// for speed reasons, we assume that all latin1 characters
743// are single-width (the first unicdoe combining character 690// are single-width (the first unicode combining character
744// is actually 0x300, but ascii is what matters most). 691// is actually 0x300, but ascii is what matters most).
745#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c)) 692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
746 693
747/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
748#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
749#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
750#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
947 894
948#ifdef KEYSYM_RESOURCE 895#ifdef KEYSYM_RESOURCE
949 class keyboard_manager; 896 class keyboard_manager;
950#endif 897#endif
951 898
952struct rxvt_term : zero_initialized, rxvt_vars { 899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
953 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
954 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
955#if ENABLE_PERL 902#if ENABLE_PERL
956 rxvt_perl_term perl; 903 rxvt_perl_term perl;
957#endif 904#endif
… …
1035 int old_width, /* last used width in screen resize */ 982 int old_width, /* last used width in screen resize */
1036 old_height; /* last used height in screen resize */ 983 old_height; /* last used height in screen resize */
1037 unsigned long priv_modes, 984 unsigned long priv_modes,
1038 SavedModes; 985 SavedModes;
1039/* ---------- */ 986/* ---------- */
1040 Atom xa[NUM_XA]; 987 Atom *xa;
1041/* ---------- */ 988/* ---------- */
1042#ifdef RXVT_SCROLLBAR 989#ifdef RXVT_SCROLLBAR
1043 GC scrollbarGC, 990 GC scrollbarGC,
1044 topShadowGC, 991 topShadowGC,
1045 botShadowGC; 992 botShadowGC;
… …
1102 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;
1103#endif 1050#endif
1104 1051
1105 vector<void *> allocated; // free these memory blocks with free() 1052 vector<void *> allocated; // free these memory blocks with free()
1106 1053
1107 char *env_windowid; /* environmental variable WINDOWID */ 1054 char env_windowid[21]; /* environmental variable WINDOWID */
1055 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1108 char *env_display; /* environmental variable DISPLAY */ 1056 char *env_display; /* environmental variable DISPLAY */
1109 char *env_term; /* environmental variable TERM */ 1057 char *env_term; /* environmental variable TERM */
1110 char *env_colorfgbg; 1058
1111 char *locale; 1059 char *locale;
1112 char charsets[4]; 1060 char charsets[4];
1113 char *v_buffer; /* pointer to physical buffer */ 1061 char *v_buffer; /* pointer to physical buffer */
1114 unsigned int v_buflen; /* size of area to write */ 1062 unsigned int v_buflen; /* size of area to write */
1115 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1063 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1116 1064
1117#ifdef KEYSYM_RESOURCE 1065#ifdef KEYSYM_RESOURCE
1118 keyboard_manager *keyboard; 1066 keyboard_manager *keyboard;
1119#endif 1067#endif
1120 1068
… …
1146 1094
1147 long vt_emask, vt_emask_perl, vt_emask_xim; 1095 long vt_emask, vt_emask_perl, vt_emask_xim;
1148 1096
1149 void vt_select_input () const NOTHROW 1097 void vt_select_input () const NOTHROW
1150 { 1098 {
1151 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1152 } 1100 }
1153 1101
1154#if TRANSPARENT 1102#if TRANSPARENT
1155 void rootwin_cb (XEvent &xev); 1103 void rootwin_cb (XEvent &xev);
1156 xevent_watcher rootwin_ev; 1104 xevent_watcher rootwin_ev;
… …
1308 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);
1309 void set_title (const char *str); 1257 void set_title (const char *str);
1310 void set_icon_name (const char *str); 1258 void set_icon_name (const char *str);
1311 void set_window_color (int idx, const char *color); 1259 void set_window_color (int idx, const char *color);
1312 void set_colorfgbg (); 1260 void set_colorfgbg ();
1313 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1261 bool set_color (rxvt_color &color, const char *name);
1314 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1262 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1315 1263
1316 // screen.C 1264 // screen.C
1317 1265
1318 void lalloc (line_t &l) const 1266 void lalloc (line_t &l) const

Diff Legend

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