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.243 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.248 by root, Mon Jan 30 16:12:58 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,
… …
699 ***************************************************************************** 683 *****************************************************************************
700 * MACRO DEFINES 684 * MACRO DEFINES
701 ***************************************************************************** 685 *****************************************************************************
702 */ 686 */
703#define dLocal(type,name) type const name = this->name 687#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 688
706// for speed reasons, we assume that all latin1 characters 689// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicdoe combining character 690// are single-width (the first unicode combining character
708// is actually 0x300, but ascii is what matters most). 691// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c)) 692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
710 693
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
911 894
912#ifdef KEYSYM_RESOURCE 895#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 896 class keyboard_manager;
914#endif 897#endif
915 898
916struct rxvt_term : zero_initialized, rxvt_vars { 899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
917 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
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 902#if ENABLE_PERL
920 rxvt_perl_term perl; 903 rxvt_perl_term perl;
921#endif 904#endif
… …
1111 1094
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1095 long vt_emask, vt_emask_perl, vt_emask_xim;
1113 1096
1114 void vt_select_input () const NOTHROW 1097 void vt_select_input () const NOTHROW
1115 { 1098 {
1116 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 } 1100 }
1118 1101
1119#if TRANSPARENT 1102#if TRANSPARENT
1120 void rootwin_cb (XEvent &xev); 1103 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1104 xevent_watcher rootwin_ev;

Diff Legend

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