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.155 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.169 by root, Thu Dec 22 19:44:21 2005 UTC

… …
118char ** rxvt_splitcommastring (const char *cs); 118char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
120char * rxvt_File_find (const char *file, const char *ext, const char *path); 120char * rxvt_File_find (const char *file, const char *ext, const char *path);
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
123void rxvt_usleep (int usecs);
123 124
124/* 125/*
125 ***************************************************************************** 126 *****************************************************************************
126 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
127 ***************************************************************************** 128 *****************************************************************************
… …
137#endif 138#endif
138 139
139/* If we're using either the rxvt scrollbar or menu bars, keep the 140/* If we're using either the rxvt scrollbar or menu bars, keep the
140 * scrollColor resource. 141 * scrollColor resource.
141 */ 142 */
142#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
143# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
144#else 145#else
145# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
146#endif 147#endif
147 148
… …
161 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
162 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
163 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
164}; 165};
165 166
166#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
167#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
168#define SWAP_IT(one, two, typeof) \
169 do { \
170 typeof swapittmp; \
171 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
172 } while (/* CONSTCOND */ 0)
173#define BOUND_POSITIVE_INT16(val) \
174 (int16_t) ((val) <= 0 \
175 ? 0 \
176 : min ((val), (((uint16_t)-1)>>1)))
177
178#if ENABLE_FRILLS 167#if ENABLE_FRILLS
179typedef struct _mwmhints { 168typedef struct _mwmhints {
180 CARD32 flags; 169 CARD32 flags;
181 CARD32 functions; 170 CARD32 functions;
182 CARD32 decorations; 171 CARD32 decorations;
… …
267 256
268#define R_SB_ALIGN_CENTRE 0 257#define R_SB_ALIGN_CENTRE 0
269#define R_SB_ALIGN_TOP 1 258#define R_SB_ALIGN_TOP 1
270#define R_SB_ALIGN_BOTTOM 2 259#define R_SB_ALIGN_BOTTOM 2
271 260
272#define R_SB_RXVT 0
273#define R_SB_NEXT 1 261#define R_SB_NEXT 1
274#define R_SB_XTERM 2 262#define R_SB_XTERM 2
275#define R_SB_PLAIN 4 263#define R_SB_PLAIN 4
264#define R_SB_RXVT 8
276 265
277#define SB_WIDTH_NEXT 19 266#define SB_WIDTH_NEXT 19
278#define SB_WIDTH_XTERM 15 267#define SB_WIDTH_XTERM 15
279#define SB_WIDTH_PLAIN 7 268#define SB_WIDTH_PLAIN 7
280#ifndef SB_WIDTH_RXVT 269#ifndef SB_WIDTH_RXVT
… …
362#define FONT_DN "#-" 351#define FONT_DN "#-"
363#define FONT_UP "#+" 352#define FONT_UP "#+"
364 353
365/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
366enum { 355enum {
367 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
368 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
369 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
370}; 359};
371 360
372/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
373enum { 362enum {
374 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
… …
490 URxvt_view_down = 721, 479 URxvt_view_down = 721,
491}; 480};
492 481
493/* Words starting with `Color_' are colours. Others are counts */ 482/* Words starting with `Color_' are colours. Others are counts */
494/* 483/*
495 * The following comment is mostly obsolete since pixcolor_set was expanded:
496 * We're currently upto 29 colours. Only 3 more available. The
497 * PixColor and rendition colour usage should probably be decoupled 484 * The PixColor and rendition colour usage should probably be decoupled
498 * on the unnecessary items, e.g. Color_pointer, but won't bother 485 * on the unnecessary items, e.g. Color_pointer, but won't bother
499 * until we need to. Also, be aware of usage in pixcolor_set 486 * until we need to. Also, be aware of usage in pixcolor_set
500 */ 487 */
501 488
502enum colour_list { 489enum colour_list {
… …
552 Color_trough, 539 Color_trough,
553#endif 540#endif
554#if TINTING 541#if TINTING
555 Color_tint, 542 Color_tint,
556#endif 543#endif
544#if OFF_FOCUS_FADING
545 Color_fade,
546#endif
557 NRS_COLORS, /* */ 547 NRS_COLORS, /* */
558#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
559 Color_topShadow = NRS_COLORS, 549 Color_topShadow = NRS_COLORS,
560 Color_bottomShadow, 550 Color_bottomShadow,
561 TOTAL_COLORS 551 TOTAL_COLORS
… …
639#ifdef TRANSPARENT 629#ifdef TRANSPARENT
640 Rs_transparent, 630 Rs_transparent,
641 Rs_transparent_all, 631 Rs_transparent_all,
642#endif 632#endif
643#if ENABLE_FRILLS 633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
644 Rs_ext_bwidth, 636 Rs_ext_bwidth,
645 Rs_int_bwidth, 637 Rs_int_bwidth,
646 Rs_borderLess, 638 Rs_borderLess,
647 Rs_lineSpace, 639 Rs_lineSpace,
648 Rs_pty_fd,
649 Rs_cursorUnderline, 640 Rs_cursorUnderline,
650#endif 641#endif
651#if CURSOR_BLINK 642#if CURSOR_BLINK
652 Rs_cursorBlink, 643 Rs_cursorBlink,
653#endif 644#endif
… …
816#define dDisp Display *disp = display->display 807#define dDisp Display *disp = display->display
817 808
818/* convert pixel dimensions to row/column values. Everything as int32_t */ 809/* convert pixel dimensions to row/column values. Everything as int32_t */
819#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 810#define Pixel2Col(x) Pixel2Width((int32_t)(x))
820#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 811#define Pixel2Row(y) Pixel2Height((int32_t)(y))
821#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 812#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
822#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 813#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
823#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 814#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
824#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 815#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
825#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 816#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
826#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 817#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
827 818
828#define TermWin_TotalWidth() ((int32_t)TermWin.width) 819#define TermWin_TotalWidth() ((int32_t)this->width)
829#define TermWin_TotalHeight() ((int32_t)TermWin.height) 820#define TermWin_TotalHeight() ((int32_t)this->height)
821
822// for m >= -n, ensure remainder lies between 0..n-1
823#define MOD(m,n) (((m) + (n)) % (n))
824
825#define LINENO(n) MOD (term_start + int(n), total_rows)
826#define ROW(n) row_buf [LINENO (n)]
830 827
831/* how to build & extract colors and attributes */ 828/* how to build & extract colors and attributes */
832#define GET_BASEFG(x) (((x) & RS_fgMask)) 829#define GET_BASEFG(x) (((x) & RS_fgMask))
833#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 830#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
834#ifndef NO_BRIGHTCOLOR 831#ifndef NO_BRIGHTCOLOR
835# define GET_FGCOLOR(x) \ 832# define GET_FGCOLOR(x) \
836 ((((x) & RS_Bold) == 0 \ 833 ((((x) & RS_Bold) == 0 \
837 || GET_BASEFG (x) < minCOLOR \ 834 || GET_BASEFG (x) < minCOLOR \
838 || GET_BASEFG (x) >= minBrightCOLOR) \ 835 || GET_BASEFG (x) >= minBrightCOLOR) \
839 ? GET_BASEFG (x) \ 836 ? GET_BASEFG (x) \
840 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 837 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
841# define GET_BGCOLOR(x) \ 838# define GET_BGCOLOR(x) \
842 ((((x) & RS_Blink) == 0 \ 839 ((((x) & RS_Blink) == 0 \
843 || GET_BASEBG (x) < minCOLOR \ 840 || GET_BASEBG (x) < minCOLOR \
844 || GET_BASEBG (x) >= minBrightCOLOR) \ 841 || GET_BASEBG (x) >= minBrightCOLOR) \
845 ? GET_BASEBG (x) \ 842 ? GET_BASEBG (x) \
846 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 843 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
847#else 844#else
… …
868 865
869#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 866#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
870#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 867#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
871 868
872#if ENABLE_STYLES 869#if ENABLE_STYLES
873# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 870# define FONTSET(style) fontset[GET_STYLE (style)]
874#else 871#else
875# define FONTSET(style) TermWin.fontset[0] 872# define FONTSET(style) fontset[0]
876#endif 873#endif
877 874
878#ifdef HAVE_SCROLLBARS 875#ifdef HAVE_SCROLLBARS
879# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 876# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
880#else 877#else
… …
905#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 902#define scrollbar_size() (scrollBar.end - scrollBar.beg \
906 - scrollbar_minheight ()) 903 - scrollbar_minheight ())
907 904
908#if (MENUBAR_MAX > 1) 905#if (MENUBAR_MAX > 1)
909/* rendition style flags */ 906/* rendition style flags */
910# define menuBar_height() (TermWin.fheight + SHADOW) 907# define menuBar_height() (fheight + SHADOW)
911# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 908# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
912# define isMenuBarWindow(w) ((w) == menuBar.win) 909# define isMenuBarWindow(w) ((w) == menuBar.win)
913#else 910#else
914# define menuBar_height() (0) 911# define menuBar_height() (0)
915# define menuBar_TotalHeight() (0) 912# define menuBar_TotalHeight() (0)
… …
1227 void scr_overlay_off (); 1224 void scr_overlay_off ();
1228 void scr_overlay_set (int x, int y, 1225 void scr_overlay_set (int x, int y,
1229 text_t text, 1226 text_t text,
1230 rend_t rend = OVERLAY_RSTYLE); 1227 rend_t rend = OVERLAY_RSTYLE);
1231 void scr_overlay_set (int x, int y, const char *s); 1228 void scr_overlay_set (int x, int y, const char *s);
1229 void scr_overlay_set (int x, int y, const wchar_t *s);
1232#endif 1230#endif
1233 1231
1234 vector<void *> allocated; // free these memory blocks with free() 1232 vector<void *> allocated; // free these memory blocks with free()
1235 1233
1236 char *env_windowid; /* environmental variable WINDOWID */ 1234 char *env_windowid; /* environmental variable WINDOWID */
… …
1276#if TRANSPARENT 1274#if TRANSPARENT
1277 void rootwin_cb (XEvent &xev); 1275 void rootwin_cb (XEvent &xev);
1278 xevent_watcher rootwin_ev; 1276 xevent_watcher rootwin_ev;
1279#endif 1277#endif
1280 1278
1281
1282 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1283 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1284
1285 void x_cb (XEvent &xev); 1279 void x_cb (XEvent &xev);
1286 xevent_watcher termwin_ev; 1280 xevent_watcher termwin_ev;
1287 xevent_watcher vt_ev; 1281 xevent_watcher vt_ev;
1288#ifdef HAVE_SCROLLBARS 1282#ifdef HAVE_SCROLLBARS
1289 xevent_watcher scrollbar_ev; 1283 xevent_watcher scrollbar_ev;
… …
1329 1323
1330 void tt_winch (); 1324 void tt_winch ();
1331 1325
1332 rxvt_term (); 1326 rxvt_term ();
1333 ~rxvt_term (); 1327 ~rxvt_term ();
1328 void child_exit (); // child has exited, usually destroys
1334 void destroy (); 1329 void destroy ();
1335 void emergency_cleanup (); 1330 void emergency_cleanup ();
1336 1331
1337 bool init (int argc, const char *const *argv); 1332 bool init (int argc, const char *const *argv);
1338 bool init_vars (); 1333 bool init_vars ();
… …
1349 int run_child (const char *const *argv); 1344 int run_child (const char *const *argv);
1350 1345
1351 void color_aliases (int idx); 1346 void color_aliases (int idx);
1352 void recolour_cursor (); 1347 void recolour_cursor ();
1353 void create_windows (int argc, const char *const *argv); 1348 void create_windows (int argc, const char *const *argv);
1354 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1349 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1355 void window_calc (unsigned int width, unsigned int height); 1350 void window_calc (unsigned int newwidth, unsigned int newheight);
1356 1351
1357#if USE_XIM 1352#if USE_XIM
1358 rxvt_xim *input_method; 1353 rxvt_xim *input_method;
1359 XIC Input_Context; 1354 XIC Input_Context;
1360 XIMStyle input_style; 1355 XIMStyle input_style;
… …
1432 void set_title (const char *str); 1427 void set_title (const char *str);
1433 void set_icon_name (const char *str); 1428 void set_icon_name (const char *str);
1434 void set_window_color (int idx, const char *color); 1429 void set_window_color (int idx, const char *color);
1435 void set_colorfgbg (); 1430 void set_colorfgbg ();
1436 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1431 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1437 void set_widthheight (unsigned int width, unsigned int height); 1432 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1438 1433
1439#ifdef MENUBAR 1434#ifdef MENUBAR
1440 // menubar.C 1435 // menubar.C
1441 void menuitem_free (menu_t *menu, menuitem_t *item); 1436 void menuitem_free (menu_t *menu, menuitem_t *item);
1442 int action_dispatch (action_t *action); 1437 int action_dispatch (action_t *action);
… …
1468 void menubar_control (XButtonEvent &ev); 1463 void menubar_control (XButtonEvent &ev);
1469 void map_menuBar (int map); 1464 void map_menuBar (int map);
1470#endif 1465#endif
1471 1466
1472 // screen.C 1467 // screen.C
1473 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1468
1474 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1469 void lalloc (line_t &l)
1470 {
1471 l.t = (text_t *)talloc->alloc ();
1472 l.r = (rend_t *)ralloc->alloc ();
1473 }
1474
1475#if 0
1476 void lfree (line_t &l)
1477 {
1478 talloc->free (l.t);
1479 ralloc->free (l.r);
1480 }
1481#endif
1482
1483 void lresize (line_t &l)
1484 {
1485 if (!l.t)
1486 return;
1487
1488 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1489 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1490
1491 l.l = min (l.l, ncol);
1492
1493 if (ncol > prev_ncol)
1494 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1495 }
1496
1497 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1498 void scr_blank_screen_mem (line_t &l, rend_t efs);
1475 int scr_scroll_text (int row1, int row2, int count, int spec); 1499 int scr_scroll_text (int row1, int row2, int count);
1476 void scr_reset (); 1500 void scr_reset ();
1477 void scr_reset_realloc ();
1478 void scr_release (); 1501 void scr_release ();
1479 void scr_clear (bool really = false); 1502 void scr_clear (bool really = false);
1480 void scr_refresh (unsigned char refresh_type); 1503 void scr_refresh (unsigned char refresh_type);
1481 bool scr_refresh_rend (rend_t mask, rend_t value); 1504 bool scr_refresh_rend (rend_t mask, rend_t value);
1482 void scr_erase_screen (int mode); 1505 void scr_erase_screen (int mode);
… …
1488 void scr_touch (bool refresh); 1511 void scr_touch (bool refresh);
1489 void scr_expose (int x, int y, int width, int height, bool refresh); 1512 void scr_expose (int x, int y, int width, int height, bool refresh);
1490 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1513 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1491 void scr_recolour (); 1514 void scr_recolour ();
1492 void scr_remap_chars (); 1515 void scr_remap_chars ();
1493 void scr_remap_chars (text_t *tp, rend_t *rp); 1516 void scr_remap_chars (const line_t &l);
1494 1517
1495 void scr_poweron (); 1518 void scr_poweron ();
1496 void scr_cursor (int mode); 1519 void scr_cursor (int mode);
1497 void scr_do_wrap (); 1520 void scr_do_wrap ();
1498 int scr_change_screen (int scrn); 1521 int scr_change_screen (int scrn);

Diff Legend

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