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.242 by root, Wed Jan 25 02:42:06 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
… …
169extern char **environ; 170extern char **environ;
170extern char **rxvt_environ; // the original environ pointer 171extern char **rxvt_environ; // the original environ pointer
171 172
172inline void set_environ (stringvec *envv) 173inline void set_environ (stringvec *envv)
173{ 174{
175#if ENABLE_PERL
176 assert (envv);
177#else
174 if (envv) 178 if (envv)
179#endif
175 environ = (char **)envv->begin (); 180 environ = (char **)envv->begin ();
176} 181}
177 182
178inline void set_environ (char **envv) 183inline void set_environ (char **envv)
179{ 184{
185#if ENABLE_PERL
186 assert (envv);
187#else
180 if (envv) 188 if (envv)
189#endif
181 environ = envv; 190 environ = envv;
182} 191}
183 192
184/* 193/*
185 ***************************************************************************** 194 *****************************************************************************
… …
610# undef def 619# undef def
611# undef reserve 620# undef reserve
612 NUM_RESOURCES 621 NUM_RESOURCES
613}; 622};
614 623
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};
650
651/* DEC private modes */ 624/* DEC private modes */
652#define PrivMode_132 (1UL<<0) 625#define PrivMode_132 (1UL<<0)
653#define PrivMode_132OK (1UL<<1) 626#define PrivMode_132OK (1UL<<1)
654#define PrivMode_rVideo (1UL<<2) 627#define PrivMode_rVideo (1UL<<2)
655#define PrivMode_relOrigin (1UL<<3) 628#define PrivMode_relOrigin (1UL<<3)
… …
728 ***************************************************************************** 701 *****************************************************************************
729 */ 702 */
730#define dLocal(type,name) type const name = this->name 703#define dLocal(type,name) type const name = this->name
731#define dDisp Display *disp = this->display->display 704#define dDisp Display *disp = this->display->display
732 705
706// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicdoe combining character
708// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
710
733/* convert pixel dimensions to row/column values. Everything as int32_t */ 711/* convert pixel dimensions to row/column values. Everything as int32_t */
734#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 712#define Pixel2Col(x) Pixel2Width((int32_t)(x))
735#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 713#define Pixel2Row(y) Pixel2Height((int32_t)(y))
736#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
737#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight) 715#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
… …
813 791
814#ifdef XPM_BACKGROUND 792#ifdef XPM_BACKGROUND
815# 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))
816#else 794#else
817# define XPMClearArea(a, b, c, d, e, f, g) 795# define XPMClearArea(a, b, c, d, e, f, g)
818#endif
819
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 796#endif
840 797
841typedef callback1<void, const char *> log_callback; 798typedef callback1<void, const char *> log_callback;
842typedef callback1<int, int> getfd_callback; 799typedef callback1<int, int> getfd_callback;
843 800
… …
1042 int old_width, /* last used width in screen resize */ 999 int old_width, /* last used width in screen resize */
1043 old_height; /* last used height in screen resize */ 1000 old_height; /* last used height in screen resize */
1044 unsigned long priv_modes, 1001 unsigned long priv_modes,
1045 SavedModes; 1002 SavedModes;
1046/* ---------- */ 1003/* ---------- */
1047 Atom xa[NUM_XA]; 1004 Atom *xa;
1048/* ---------- */ 1005/* ---------- */
1049#ifdef RXVT_SCROLLBAR 1006#ifdef RXVT_SCROLLBAR
1050 GC scrollbarGC, 1007 GC scrollbarGC,
1051 topShadowGC, 1008 topShadowGC,
1052 botShadowGC; 1009 botShadowGC;
… …
1149#endif 1106#endif
1150 1107
1151 // modifies first argument(!) 1108 // modifies first argument(!)
1152 void paste (char *data, unsigned int len) NOTHROW; 1109 void paste (char *data, unsigned int len) NOTHROW;
1153 1110
1154 long vt_emask, vt_emask_perl; 1111 long vt_emask, vt_emask_perl, vt_emask_xim;
1155 1112
1156 void vt_select_input () const NOTHROW 1113 void vt_select_input () const NOTHROW
1157 { 1114 {
1158 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1115 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1159 } 1116 }
1160 1117
1161#if TRANSPARENT 1118#if TRANSPARENT
1162 void rootwin_cb (XEvent &xev); 1119 void rootwin_cb (XEvent &xev);
1163 xevent_watcher rootwin_ev; 1120 xevent_watcher rootwin_ev;
… …
1249 void create_windows (int argc, const char *const *argv); 1206 void create_windows (int argc, const char *const *argv);
1250 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1207 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1251 void window_calc (unsigned int newwidth, unsigned int newheight); 1208 void window_calc (unsigned int newwidth, unsigned int newheight);
1252 1209
1253#if USE_XIM 1210#if USE_XIM
1254 rxvt_xim *input_method; 1211 rxvt_xim *input_method;
1255 XIC Input_Context; 1212 XIC Input_Context;
1256 XIMStyle input_style; 1213 XIMStyle input_style;
1257 XPoint spot; // most recently sent spot position 1214 XPoint spot; // most recently sent spot position
1258 1215
1259 void im_destroy (); 1216 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1217 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1218 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos) NOTHROW; 1219 void im_set_position (XPoint &pos) NOTHROW;
… …
1320 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1277 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1278 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 1279
1323 // screen.C 1280 // screen.C
1324 1281
1325 void lalloc (line_t &l) const NOTHROW 1282 void lalloc (line_t &l) const
1326 { 1283 {
1327 l.t = (text_t *)talloc->alloc (); 1284 l.t = (text_t *)talloc->alloc ();
1328 l.r = (rend_t *)ralloc->alloc (); 1285 l.r = (rend_t *)ralloc->alloc ();
1329 } 1286 }
1330 1287
… …
1334 talloc->free (l.t); 1291 talloc->free (l.t);
1335 ralloc->free (l.r); 1292 ralloc->free (l.r);
1336 } 1293 }
1337#endif 1294#endif
1338 1295
1339 void lresize (line_t &l) const NOTHROW 1296 void lresize (line_t &l) const
1340 { 1297 {
1341 if (!l.t) 1298 if (!l.t)
1342 return; 1299 return;
1343 1300
1344 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1301 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1412 void scr_remap_chars () NOTHROW; 1369 void scr_remap_chars () NOTHROW;
1413 void scr_remap_chars (line_t &l) NOTHROW; 1370 void scr_remap_chars (line_t &l) NOTHROW;
1414 1371
1415 enum cursor_mode { SAVE, RESTORE }; 1372 enum cursor_mode { SAVE, RESTORE };
1416 1373
1417 void scr_poweron () NOTHROW; 1374 void scr_poweron ();
1418 void scr_cursor (cursor_mode mode) NOTHROW; 1375 void scr_cursor (cursor_mode mode) NOTHROW;
1419 void scr_do_wrap () NOTHROW; 1376 void scr_do_wrap () NOTHROW;
1377 void scr_swap_screen () NOTHROW;
1420 int scr_change_screen (int scrn) NOTHROW; 1378 void scr_change_screen (int scrn);
1421 void scr_color (unsigned int color, int fgbg) NOTHROW; 1379 void scr_color (unsigned int color, int fgbg) NOTHROW;
1422 void scr_rendition (int set, int style) NOTHROW; 1380 void scr_rendition (int set, int style) NOTHROW;
1423 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1381 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1424 void scr_backspace () NOTHROW; 1382 void scr_backspace () NOTHROW;
1425 void scr_tab (int count, bool ht = false) NOTHROW; 1383 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1517# define __PROTO(p) p 1475# define __PROTO(p) p
1518#else 1476#else
1519# define __PROTO(p) () 1477# define __PROTO(p) ()
1520#endif 1478#endif
1521 1479
1522#ifdef DEBUG_malloc
1523# include "dmalloc.h" /* This comes last */
1524#endif
1525
1526#endif /* _RXVT_H_ */ 1480#endif /* _RXVT_H_ */
1527 1481

Diff Legend

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