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.234 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.268 by ayin, Tue May 1 21:10:04 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
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
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
40#include "libptytty.h" 43#include "libptytty.h"
… …
67 70
68#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
69typedef char *XPointer; 72typedef char *XPointer;
70#endif 73#endif
71 74
72#ifdef HAVE_TERMIOS_H
73# include <termios.h> 75#include <termios.h>
74typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
75#else
76# include <sgtty.h>
77typedef struct {
78 struct sgttyb sg;
79 struct tchars tc;
80 struct ltchars lc;
81 int line;
82 int local;
83} ttymode_t;
84#endif
85 77
86#ifdef XPM_BACKGROUND 78#ifdef XPM_BACKGROUND
87# ifdef XPM_INC_X11 79# ifdef XPM_INC_X11
88# include <X11/xpm.h> 80# include <X11/xpm.h>
89# else 81# else
… …
96# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
97# define STDERR_FILENO 2 89# define STDERR_FILENO 2
98#endif 90#endif
99 91
100/****************************************************************************/ 92/****************************************************************************/
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 93
123// exception thrown on fatal (per-instance) errors 94// exception thrown on fatal (per-instance) errors
124class rxvt_failure_exception { }; 95class rxvt_failure_exception { };
125 96
126// exception thrown when the command parser runs out of input data 97// exception thrown when the command parser runs out of input data
… …
169extern char **environ; 140extern char **environ;
170extern char **rxvt_environ; // the original environ pointer 141extern char **rxvt_environ; // the original environ pointer
171 142
172inline void set_environ (stringvec *envv) 143inline void set_environ (stringvec *envv)
173{ 144{
145#if ENABLE_PERL
146 assert (envv);
147#else
174 if (envv) 148 if (envv)
149#endif
175 environ = (char **)envv->begin (); 150 environ = (char **)envv->begin ();
176} 151}
177 152
178inline void set_environ (char **envv) 153inline void set_environ (char **envv)
179{ 154{
155#if ENABLE_PERL
156 assert (envv);
157#else
180 if (envv) 158 if (envv)
159#endif
181 environ = envv; 160 environ = envv;
182} 161}
183 162
184/* 163/*
185 ***************************************************************************** 164 *****************************************************************************
… …
423// fake styles 402// fake styles
424#define RS_Blink 0x00010000UL // blink 403#define RS_Blink 0x00010000UL // blink
425#define RS_RVid 0x00020000UL // reverse video 404#define RS_RVid 0x00020000UL // reverse video
426#define RS_Uline 0x00040000UL // underline 405#define RS_Uline 0x00040000UL // underline
427 406
407// toggle this to force redraw, must be != RS_Careful
408#define RS_redraw 0x01000000UL
409
428// 5 custom bits for extensions 410// 5 custom bits for extensions
429#define RS_customCount 32 411#define RS_customCount 32
430#define RS_customMask 0x00f80000UL 412#define RS_customMask 0x00f80000UL
431#define RS_customShift 19 413#define RS_customShift 19
432 414
… …
501 Rxvt_restoreFG = 39, // change default fg color 483 Rxvt_restoreFG = 39, // change default fg color
502 Rxvt_restoreBG = 49, // change default bg color 484 Rxvt_restoreBG = 49, // change default bg color
503 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 485 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
504 486
505 URxvt_locale = 701, // change locale 487 URxvt_locale = 701, // change locale
488 URxvt_version = 702, // request version
506 489
507 URxvt_Color_IT = 704, // change actual 'Italic' colour 490 URxvt_Color_IT = 704, // change actual 'Italic' colour
508 URxvt_Color_tint = 705, // change actual tint colour 491 URxvt_Color_tint = 705, // change actual tint colour
509 URxvt_Color_BD = 706, 492 URxvt_Color_BD = 706,
510 URxvt_Color_UL = 707, 493 URxvt_Color_UL = 707,
… …
526 * on the unnecessary items, e.g. Color_pointer, but won't bother 509 * on the unnecessary items, e.g. Color_pointer, but won't bother
527 * until we need to. Also, be aware of usage in pixcolor_set 510 * until we need to. Also, be aware of usage in pixcolor_set
528 */ 511 */
529 512
530enum colour_list { 513enum colour_list {
514 Color_none = -2,
515 Color_transparent = -1,
531 Color_fg = 0, 516 Color_fg = 0,
532 Color_bg, 517 Color_bg,
533 minCOLOR, /* 2 */ 518 minCOLOR, /* 2 */
534 Color_Black = minCOLOR, 519 Color_Black = minCOLOR,
535 Color_Red3, 520 Color_Red3,
… …
595#endif 580#endif
596}; 581};
597 582
598#define Color_Bits 7 // 0 .. maxTermCOLOR 583#define Color_Bits 7 // 0 .. maxTermCOLOR
599 584
600#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
601#define NPIXCLR_BITS 32
602
603/* 585/*
604 * Resource list 586 * Resource list
605 */ 587 */
606enum { 588enum {
607# define def(name) Rs_ ## name, 589# define def(name) Rs_ ## name,
608# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 590# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
609# include "rsinc.h" 591# include "rsinc.h"
610# undef def 592# undef def
611# undef reserve 593# undef reserve
612 NUM_RESOURCES 594 NUM_RESOURCES
613};
614
615// see init.C:xa_names, which must be kept in sync
616enum {
617 XA_TEXT = 0,
618 XA_COMPOUND_TEXT,
619 XA_UTF8_STRING,
620 XA_MULTIPLE,
621 XA_TARGETS,
622 XA_TIMESTAMP,
623 XA_VT_SELECTION,
624 XA_INCR,
625 XA_WM_PROTOCOLS,
626 XA_WM_DELETE_WINDOW,
627 XA_CLIPBOARD,
628#if ENABLE_FRILLS
629 XA_MOTIF_WM_HINTS,
630#endif
631#if ENABLE_EWMH
632 XA_NET_WM_PID,
633 XA_NET_WM_NAME,
634 XA_NET_WM_ICON_NAME,
635 XA_NET_WM_PING,
636#endif
637#if USE_XIM
638 XA_WM_LOCALE_NAME,
639#endif
640#if TRANSPARENT
641 XA_XROOTPMAP_ID,
642 XA_ESETROOT_PMAP_ID,
643#endif
644#if ENABLE_XEMBED
645 XA_XEMBED,
646 XA_XEMBED_INFO,
647#endif
648 NUM_XA
649}; 595};
650 596
651/* DEC private modes */ 597/* DEC private modes */
652#define PrivMode_132 (1UL<<0) 598#define PrivMode_132 (1UL<<0)
653#define PrivMode_132OK (1UL<<1) 599#define PrivMode_132OK (1UL<<1)
… …
726 ***************************************************************************** 672 *****************************************************************************
727 * MACRO DEFINES 673 * MACRO DEFINES
728 ***************************************************************************** 674 *****************************************************************************
729 */ 675 */
730#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
731#define dDisp Display *disp = this->display->display 677
678// for speed reasons, we assume that all codepoints 32 to 126 are
679// single-width.
680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
732 681
733/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
734#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
735#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
736#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
738#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
739#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
740#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
741#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
742 691
743#define OPTION(opt) (options & (opt)) 692#define OPTION(opt) option(opt)
744#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
745 | Opt_jumpScroll | Opt_secondaryScreen \
746 | Opt_pastableTabs | Opt_intensityStyles)
747 693
748// for m >= -n, ensure remainder lies between 0..n-1 694// for m >= -n, ensure remainder lies between 0..n-1
749#define MOD(m,n) (((m) + (n)) % (n)) 695#define MOD(m,n) (((m) + (n)) % (n))
750 696
751#define LINENO(n) MOD (term_start + int(n), total_rows) 697#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
770#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 716#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
771#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 717#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
772 718
773#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 719#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
774 720
775#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 721#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
776#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 722#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
777 723
778#if ENABLE_STYLES 724#if ENABLE_STYLES
779# define FONTSET(style) fontset[GET_STYLE (style)] 725# define FONTSET(style) fontset[GET_STYLE (style)]
780#else 726#else
781# define FONTSET(style) fontset[0] 727# define FONTSET(style) fontset[0]
… …
815# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 761# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
816#else 762#else
817# define XPMClearArea(a, b, c, d, e, f, g) 763# define XPMClearArea(a, b, c, d, e, f, g)
818#endif 764#endif
819 765
820#ifdef DEBUG_CMD
821# define D_CMD(x) fprintf x ; fputc('\n', stderr)
822#else
823# define D_CMD(x)
824#endif
825#ifdef DEBUG_INIT
826# define D_INIT(x) fprintf x ; fputc('\n', stderr)
827#else
828# define D_INIT(x)
829#endif
830#ifdef DEBUG_MAIN
831# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
832#else
833# define D_MAIN(x)
834#endif
835#ifdef DEBUG_SIZE
836# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
837#else
838# define D_SIZE(x)
839#endif
840
841typedef callback1<void, const char *> log_callback; 766typedef callback<void (const char *)> log_callback;
842typedef callback1<int, int> getfd_callback; 767typedef callback<int (int)> getfd_callback;
843 768
844#define SET_LOCALE(locale) rxvt_set_locale (locale) 769#define SET_LOCALE(locale) rxvt_set_locale (locale)
845extern bool rxvt_set_locale (const char *locale) NOTHROW; 770extern bool rxvt_set_locale (const char *locale) NOTHROW;
846extern void rxvt_push_locale (const char *locale) NOTHROW; 771extern void rxvt_push_locale (const char *locale) NOTHROW;
847extern void rxvt_pop_locale () NOTHROW; 772extern void rxvt_pop_locale () NOTHROW;
… …
849/****************************************************************************/ 774/****************************************************************************/
850 775
851#define LINE_LONGER 0x0001 // line is continued on the next row 776#define LINE_LONGER 0x0001 // line is continued on the next row
852#define LINE_FILTERED 0x0002 // line has been filtered 777#define LINE_FILTERED 0x0002 // line has been filtered
853#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 778#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
779#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
780#define LINE_BIDI 0x0010 // line needs bidi (NYI)
854 781
855struct line_t { 782struct line_t {
856 text_t *t; // terminal the text 783 text_t *t; // terminal the text
857 rend_t *r; // rendition, uses RS_ flags 784 rend_t *r; // rendition, uses RS_ flags
858 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 785 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
912# define COMPOSE_LO 0x40000000UL 839# define COMPOSE_LO 0x40000000UL
913# define COMPOSE_HI 0x400fffffUL 840# define COMPOSE_HI 0x400fffffUL
914# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 841# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
915#else 842#else
916# if ENABLE_PERL 843# if ENABLE_PERL
917# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 844# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
918# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 845# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
919# else 846# else
920# define COMPOSE_LO 0xd800UL 847# define COMPOSE_LO 0xd800UL
921# define COMPOSE_HI 0xf8ffUL 848# define COMPOSE_HI 0xf8ffUL
922# endif 849# endif
… …
951#endif 878#endif
952 879
953/****************************************************************************/ 880/****************************************************************************/
954 881
955#ifdef KEYSYM_RESOURCE 882#ifdef KEYSYM_RESOURCE
956 class keyboard_manager; 883class keyboard_manager;
957#endif 884#endif
958 885
959struct rxvt_term : zero_initialized, rxvt_vars { 886struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
887
888 // special markers with magic addresses
889 static const char resval_undef []; // options specifically unset
890 static const char resval_on []; // boolean options switched on
891 static const char resval_off []; // or off
892
960 log_callback *log_hook; // log error messages through this hook, if != 0 893 log_callback *log_hook; // log error messages through this hook, if != 0
961 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 894 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
962#if ENABLE_PERL 895#if ENABLE_PERL
963 rxvt_perl_term perl; 896 rxvt_perl_term perl;
964#endif 897#endif
965 struct mbstate mbstate; // current input multibyte state 898 struct mbstate mbstate; // current input multibyte state
966 899
967 unsigned char want_refresh:1, 900 unsigned char want_refresh:1,
968#ifdef TRANSPARENT 901#ifdef TRANSPARENT
969 want_full_refresh:1, /* awaiting full screen refresh */ 902 want_full_refresh:1, /* awaiting full screen refresh */
970#endif
971#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
972 am_transparent:1, /* is a transparent term */ 903 am_transparent:1, /* is a transparent term */
973 am_pixmap_trans:1, /* transparency w/known root pixmap */ 904 am_pixmap_trans:1, /* transparency w/known root pixmap */
974#endif 905#endif
975 current_screen:1, /* primary or secondary */ 906 current_screen:1, /* primary or secondary */
976 num_scr_allow:1, 907 num_scr_allow:1,
… …
1004 int num_scr; /* screen: number lines scrolled */ 935 int num_scr; /* screen: number lines scrolled */
1005 int prev_ncol, /* screen: previous number of columns */ 936 int prev_ncol, /* screen: previous number of columns */
1006 prev_nrow; /* screen: previous number of rows */ 937 prev_nrow; /* screen: previous number of rows */
1007/* ---------- */ 938/* ---------- */
1008 rend_t rstyle; 939 rend_t rstyle;
1009/* ---------- */
1010 uint32_t pixcolor_set[NPIXCLR_SETS];
1011/* ---------- */ 940/* ---------- */
1012#ifdef SELECTION_SCROLLING 941#ifdef SELECTION_SCROLLING
1013 int scroll_selection_lines; 942 int scroll_selection_lines;
1014 enum page_dirn scroll_selection_dir; 943 enum page_dirn scroll_selection_dir;
1015 int selection_save_x, 944 int selection_save_x,
… …
1042 int old_width, /* last used width in screen resize */ 971 int old_width, /* last used width in screen resize */
1043 old_height; /* last used height in screen resize */ 972 old_height; /* last used height in screen resize */
1044 unsigned long priv_modes, 973 unsigned long priv_modes,
1045 SavedModes; 974 SavedModes;
1046/* ---------- */ 975/* ---------- */
1047 Atom xa[NUM_XA]; 976 Atom *xa;
1048/* ---------- */ 977/* ---------- */
1049#ifdef RXVT_SCROLLBAR 978#ifdef RXVT_SCROLLBAR
1050 GC scrollbarGC, 979 GC scrollbarGC,
1051 topShadowGC, 980 topShadowGC,
1052 botShadowGC; 981 botShadowGC;
… …
1109 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1038 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1110#endif 1039#endif
1111 1040
1112 vector<void *> allocated; // free these memory blocks with free() 1041 vector<void *> allocated; // free these memory blocks with free()
1113 1042
1114 char *env_windowid; /* environmental variable WINDOWID */ 1043 char env_windowid[21]; /* environmental variable WINDOWID */
1044 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1115 char *env_display; /* environmental variable DISPLAY */ 1045 char *env_display; /* environmental variable DISPLAY */
1116 char *env_term; /* environmental variable TERM */ 1046 char *env_term; /* environmental variable TERM */
1117 char *env_colorfgbg; 1047
1118 char *locale; 1048 char *locale;
1119 char charsets[4]; 1049 char charsets[4];
1120 char *v_buffer; /* pointer to physical buffer */ 1050 char *v_buffer; /* pointer to physical buffer */
1121 unsigned int v_buflen; /* size of area to write */ 1051 unsigned int v_buflen; /* size of area to write */
1122 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1052 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1123 1053
1124#ifdef KEYSYM_RESOURCE 1054#ifdef KEYSYM_RESOURCE
1125 keyboard_manager *keyboard; 1055 keyboard_manager *keyboard;
1126#endif 1056#endif
1127 1057
… …
1149#endif 1079#endif
1150 1080
1151 // modifies first argument(!) 1081 // modifies first argument(!)
1152 void paste (char *data, unsigned int len) NOTHROW; 1082 void paste (char *data, unsigned int len) NOTHROW;
1153 1083
1154 long vt_emask, vt_emask_perl; 1084 long vt_emask, vt_emask_perl, vt_emask_xim;
1155 1085
1156 void vt_select_input () const NOTHROW 1086 void vt_select_input () const NOTHROW
1157 { 1087 {
1158 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1088 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1159 } 1089 }
1160 1090
1161#if TRANSPARENT 1091#if TRANSPARENT || ENABLE_PERL
1162 void rootwin_cb (XEvent &xev); 1092 void rootwin_cb (XEvent &xev);
1163 xevent_watcher rootwin_ev; 1093 xevent_watcher rootwin_ev;
1164#endif 1094#endif
1165 1095
1166 void x_cb (XEvent &xev); 1096 void x_cb (XEvent &xev);
… …
1228 bool pty_fill (); 1158 bool pty_fill ();
1229 1159
1230 void make_current () const // make this the "currently active" urxvt instance 1160 void make_current () const // make this the "currently active" urxvt instance
1231 { 1161 {
1232 SET_R (this); 1162 SET_R (this);
1163 set_environ (envv);
1233 rxvt_set_locale (locale); 1164 rxvt_set_locale (locale);
1234 set_environ (envv);
1235 } 1165 }
1236 1166
1237 void init_secondary (); 1167 void init_secondary ();
1238 const char **init_resources (int argc, const char *const *argv); 1168 const char **init_resources (int argc, const char *const *argv);
1239 const char *x_resource (const char *name); 1169 const char *x_resource (const char *name);
… …
1249 void create_windows (int argc, const char *const *argv); 1179 void create_windows (int argc, const char *const *argv);
1250 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1180 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1251 void window_calc (unsigned int newwidth, unsigned int newheight); 1181 void window_calc (unsigned int newwidth, unsigned int newheight);
1252 1182
1253#if USE_XIM 1183#if USE_XIM
1254 rxvt_xim *input_method; 1184 rxvt_xim *input_method;
1255 XIC Input_Context; 1185 XIC Input_Context;
1256 XIMStyle input_style; 1186 XIMStyle input_style;
1257 XPoint spot; // most recently sent spot position 1187 XPoint spot; // most recently sent spot position
1258 1188
1259 void im_destroy (); 1189 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1190 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1191 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos) NOTHROW; 1192 void im_set_position (XPoint &pos) NOTHROW;
… …
1264 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1194 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1265 1195
1266 bool IMisRunning (); 1196 bool IMisRunning ();
1267 void IMSendSpot (); 1197 void IMSendSpot ();
1268 bool IM_get_IC (const char *modifiers); 1198 bool IM_get_IC (const char *modifiers);
1269 void IMSetStatusPosition (); 1199 void IMSetPosition ();
1270#endif 1200#endif
1271 1201
1272 void resize_scrollbar (); 1202 void resize_scrollbar ();
1273 1203
1274 // command.C 1204 // command.C
1275 void lookup_key (XKeyEvent &ev); 1205 void key_press (XKeyEvent &ev);
1206 void key_release (XKeyEvent &ev);
1276 unsigned int cmd_write (const char *str, unsigned int count); 1207 unsigned int cmd_write (const char *str, unsigned int count);
1277 1208
1278 wchar_t next_char () NOTHROW; 1209 wchar_t next_char () NOTHROW;
1279 wchar_t cmd_getc () THROW ((class out_of_input)); 1210 wchar_t cmd_getc () THROW ((class out_of_input));
1280 uint32_t next_octet () NOTHROW; 1211 uint32_t next_octet () NOTHROW;
… …
1284 void mouse_report (XButtonEvent &ev); 1215 void mouse_report (XButtonEvent &ev);
1285 void button_press (XButtonEvent &ev); 1216 void button_press (XButtonEvent &ev);
1286 void button_release (XButtonEvent &ev); 1217 void button_release (XButtonEvent &ev);
1287 void focus_in (); 1218 void focus_in ();
1288 void focus_out (); 1219 void focus_out ();
1220 void update_fade_color (unsigned int idx);
1289 int check_our_parents (); 1221 int check_our_parents ();
1290#ifdef PRINTPIPE 1222#ifdef PRINTPIPE
1291 FILE *popen_printer (); 1223 FILE *popen_printer ();
1292 int pclose_printer (FILE *stream); 1224 int pclose_printer (FILE *stream);
1293#endif 1225#endif
… …
1315 void set_utf8_property (Atom prop, const char *str, int len = -1); 1247 void set_utf8_property (Atom prop, const char *str, int len = -1);
1316 void set_title (const char *str); 1248 void set_title (const char *str);
1317 void set_icon_name (const char *str); 1249 void set_icon_name (const char *str);
1318 void set_window_color (int idx, const char *color); 1250 void set_window_color (int idx, const char *color);
1319 void set_colorfgbg (); 1251 void set_colorfgbg ();
1320 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1252 bool set_color (rxvt_color &color, const char *name);
1253 void alias_color (int dst, int src);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1254 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 1255
1323 // screen.C 1256 // screen.C
1324 1257
1325 void lalloc (line_t &l) const NOTHROW 1258 void lalloc (line_t &l) const
1326 { 1259 {
1327 l.t = (text_t *)talloc->alloc (); 1260 l.t = (text_t *)talloc->alloc ();
1328 l.r = (rend_t *)ralloc->alloc (); 1261 l.r = (rend_t *)ralloc->alloc ();
1329 } 1262 }
1330 1263
… …
1334 talloc->free (l.t); 1267 talloc->free (l.t);
1335 ralloc->free (l.r); 1268 ralloc->free (l.r);
1336 } 1269 }
1337#endif 1270#endif
1338 1271
1339 void lresize (line_t &l) const NOTHROW 1272 void lresize (line_t &l) const
1340 { 1273 {
1341 if (!l.t) 1274 if (!l.t)
1342 return; 1275 return;
1343 1276
1344 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1277 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1376 base += minBrightCOLOR - minCOLOR; 1309 base += minBrightCOLOR - minCOLOR;
1377#endif 1310#endif
1378 return base; 1311 return base;
1379 } 1312 }
1380 1313
1381 bool option (uint32_t opt) const NOTHROW 1314 bool option (uint8_t opt) const NOTHROW
1382 { 1315 {
1383 return OPTION (opt); 1316 return options[opt >> 3] & (1 << (opt & 7));
1384 } 1317 }
1385 1318
1386 void set_option (uint32_t opt, bool set) NOTHROW 1319 void set_option (uint8_t opt, bool set) NOTHROW
1387 { 1320 {
1388 if (set) 1321 if (set)
1389 options |= opt; 1322 options[opt >> 3] |= (1 << (opt & 7));
1390 else 1323 else
1391 options &= ~opt; 1324 options[opt >> 3] &= ~(1 << (opt & 7));
1392 } 1325 }
1393 1326
1394 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1327 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1395 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1328 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1396 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1329 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1412 void scr_remap_chars () NOTHROW; 1345 void scr_remap_chars () NOTHROW;
1413 void scr_remap_chars (line_t &l) NOTHROW; 1346 void scr_remap_chars (line_t &l) NOTHROW;
1414 1347
1415 enum cursor_mode { SAVE, RESTORE }; 1348 enum cursor_mode { SAVE, RESTORE };
1416 1349
1417 void scr_poweron () NOTHROW; 1350 void scr_poweron ();
1418 void scr_cursor (cursor_mode mode) NOTHROW; 1351 void scr_cursor (cursor_mode mode) NOTHROW;
1419 void scr_do_wrap () NOTHROW; 1352 void scr_do_wrap () NOTHROW;
1353 void scr_swap_screen () NOTHROW;
1420 int scr_change_screen (int scrn) NOTHROW; 1354 void scr_change_screen (int scrn);
1421 void scr_color (unsigned int color, int fgbg) NOTHROW; 1355 void scr_color (unsigned int color, int fgbg) NOTHROW;
1422 void scr_rendition (int set, int style) NOTHROW; 1356 void scr_rendition (int set, int style) NOTHROW;
1423 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1357 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1424 void scr_backspace () NOTHROW; 1358 void scr_backspace () NOTHROW;
1425 void scr_tab (int count, bool ht = false) NOTHROW; 1359 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1517# define __PROTO(p) p 1451# define __PROTO(p) p
1518#else 1452#else
1519# define __PROTO(p) () 1453# define __PROTO(p) ()
1520#endif 1454#endif
1521 1455
1522#ifdef DEBUG_malloc
1523# include "dmalloc.h" /* This comes last */
1524#endif
1525
1526#endif /* _RXVT_H_ */ 1456#endif /* _RXVT_H_ */
1527 1457

Diff Legend

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