ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.159 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.166 by root, Wed Dec 21 14:19:19 2005 UTC

… …
162 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
163 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
164 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
165}; 165};
166 166
167#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 167#define MAX_POSITIVE_INT16 (((uint16_t)-1)>>1) // TODO: configure/limits
168#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
169#define SWAP_IT(one, two, typeof) \
170 do { \
171 typeof swapittmp; \
172 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
173 } while (/* CONSTCOND */ 0)
174#define BOUND_POSITIVE_INT16(val) \
175 (int16_t) ((val) <= 0 \
176 ? 0 \
177 : min ((val), (((uint16_t)-1)>>1)))
178 168
179#if ENABLE_FRILLS 169#if ENABLE_FRILLS
180typedef struct _mwmhints { 170typedef struct _mwmhints {
181 CARD32 flags; 171 CARD32 flags;
182 CARD32 functions; 172 CARD32 functions;
… …
491 URxvt_view_down = 721, 481 URxvt_view_down = 721,
492}; 482};
493 483
494/* Words starting with `Color_' are colours. Others are counts */ 484/* Words starting with `Color_' are colours. Others are counts */
495/* 485/*
496 * The following comment is mostly obsolete since pixcolor_set was expanded:
497 * We're currently upto 29 colours. Only 3 more available. The
498 * PixColor and rendition colour usage should probably be decoupled 486 * The PixColor and rendition colour usage should probably be decoupled
499 * on the unnecessary items, e.g. Color_pointer, but won't bother 487 * on the unnecessary items, e.g. Color_pointer, but won't bother
500 * until we need to. Also, be aware of usage in pixcolor_set 488 * until we need to. Also, be aware of usage in pixcolor_set
501 */ 489 */
502 490
503enum colour_list { 491enum colour_list {
… …
552 Color_scroll, 540 Color_scroll,
553 Color_trough, 541 Color_trough,
554#endif 542#endif
555#if TINTING 543#if TINTING
556 Color_tint, 544 Color_tint,
545#endif
546#if OFF_FOCUS_FADING
547 Color_fade,
557#endif 548#endif
558 NRS_COLORS, /* */ 549 NRS_COLORS, /* */
559#ifdef KEEP_SCROLLCOLOR 550#ifdef KEEP_SCROLLCOLOR
560 Color_topShadow = NRS_COLORS, 551 Color_topShadow = NRS_COLORS,
561 Color_bottomShadow, 552 Color_bottomShadow,
… …
817#define dDisp Display *disp = display->display 808#define dDisp Display *disp = display->display
818 809
819/* convert pixel dimensions to row/column values. Everything as int32_t */ 810/* convert pixel dimensions to row/column values. Everything as int32_t */
820#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 811#define Pixel2Col(x) Pixel2Width((int32_t)(x))
821#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 812#define Pixel2Row(y) Pixel2Height((int32_t)(y))
822#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 813#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
823#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 814#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
824#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 815#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
825#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 816#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
826#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
827#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
828 819
829#define TermWin_TotalWidth() ((int32_t)TermWin.width) 820#define TermWin_TotalWidth() ((int32_t)this->width)
830#define TermWin_TotalHeight() ((int32_t)TermWin.height) 821#define TermWin_TotalHeight() ((int32_t)this->height)
822
823#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
824#define ROW(n) (save [LINENO (n)])
831 825
832/* how to build & extract colors and attributes */ 826/* how to build & extract colors and attributes */
833#define GET_BASEFG(x) (((x) & RS_fgMask)) 827#define GET_BASEFG(x) (((x) & RS_fgMask))
834#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 828#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
835#ifndef NO_BRIGHTCOLOR 829#ifndef NO_BRIGHTCOLOR
… …
869 863
870#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 864#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
871#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 865#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
872 866
873#if ENABLE_STYLES 867#if ENABLE_STYLES
874# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 868# define FONTSET(style) fontset[GET_STYLE (style)]
875#else 869#else
876# define FONTSET(style) TermWin.fontset[0] 870# define FONTSET(style) fontset[0]
877#endif 871#endif
878 872
879#ifdef HAVE_SCROLLBARS 873#ifdef HAVE_SCROLLBARS
880# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 874# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
881#else 875#else
… …
906#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 900#define scrollbar_size() (scrollBar.end - scrollBar.beg \
907 - scrollbar_minheight ()) 901 - scrollbar_minheight ())
908 902
909#if (MENUBAR_MAX > 1) 903#if (MENUBAR_MAX > 1)
910/* rendition style flags */ 904/* rendition style flags */
911# define menuBar_height() (TermWin.fheight + SHADOW) 905# define menuBar_height() (fheight + SHADOW)
912# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 906# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
913# define isMenuBarWindow(w) ((w) == menuBar.win) 907# define isMenuBarWindow(w) ((w) == menuBar.win)
914#else 908#else
915# define menuBar_height() (0) 909# define menuBar_height() (0)
916# define menuBar_TotalHeight() (0) 910# define menuBar_TotalHeight() (0)
… …
1278#if TRANSPARENT 1272#if TRANSPARENT
1279 void rootwin_cb (XEvent &xev); 1273 void rootwin_cb (XEvent &xev);
1280 xevent_watcher rootwin_ev; 1274 xevent_watcher rootwin_ev;
1281#endif 1275#endif
1282 1276
1283
1284 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1285 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1286
1287 void x_cb (XEvent &xev); 1277 void x_cb (XEvent &xev);
1288 xevent_watcher termwin_ev; 1278 xevent_watcher termwin_ev;
1289 xevent_watcher vt_ev; 1279 xevent_watcher vt_ev;
1290#ifdef HAVE_SCROLLBARS 1280#ifdef HAVE_SCROLLBARS
1291 xevent_watcher scrollbar_ev; 1281 xevent_watcher scrollbar_ev;
… …
1351 int run_child (const char *const *argv); 1341 int run_child (const char *const *argv);
1352 1342
1353 void color_aliases (int idx); 1343 void color_aliases (int idx);
1354 void recolour_cursor (); 1344 void recolour_cursor ();
1355 void create_windows (int argc, const char *const *argv); 1345 void create_windows (int argc, const char *const *argv);
1356 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1346 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1357 void window_calc (unsigned int width, unsigned int height); 1347 void window_calc (unsigned int newwidth, unsigned int newheight);
1358 1348
1359#if USE_XIM 1349#if USE_XIM
1360 rxvt_xim *input_method; 1350 rxvt_xim *input_method;
1361 XIC Input_Context; 1351 XIC Input_Context;
1362 XIMStyle input_style; 1352 XIMStyle input_style;
… …
1434 void set_title (const char *str); 1424 void set_title (const char *str);
1435 void set_icon_name (const char *str); 1425 void set_icon_name (const char *str);
1436 void set_window_color (int idx, const char *color); 1426 void set_window_color (int idx, const char *color);
1437 void set_colorfgbg (); 1427 void set_colorfgbg ();
1438 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1428 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1439 void set_widthheight (unsigned int width, unsigned int height); 1429 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1440 1430
1441#ifdef MENUBAR 1431#ifdef MENUBAR
1442 // menubar.C 1432 // menubar.C
1443 void menuitem_free (menu_t *menu, menuitem_t *item); 1433 void menuitem_free (menu_t *menu, menuitem_t *item);
1444 int action_dispatch (action_t *action); 1434 int action_dispatch (action_t *action);
… …
1470 void menubar_control (XButtonEvent &ev); 1460 void menubar_control (XButtonEvent &ev);
1471 void map_menuBar (int map); 1461 void map_menuBar (int map);
1472#endif 1462#endif
1473 1463
1474 // screen.C 1464 // screen.C
1475 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1465
1476 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1466 void lalloc (line_t &l)
1467 {
1468 l.t = (text_t *)talloc->alloc ();
1469 l.r = (rend_t *)ralloc->alloc ();
1470 }
1471
1472 void lfree (line_t &l)
1473 {
1474 talloc->free (l.t);
1475 ralloc->free (l.r);
1476 }
1477
1478 void lresize (line_t &l)
1479 {
1480 if (!l.t)
1481 return;
1482
1483 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1484 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1485
1486 l.l = min (l.l, ncol);
1487
1488 if (ncol > prev_ncol)
1489 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1490 }
1491
1492 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1493 void scr_blank_screen_mem (line_t &l, rend_t efs);
1477 int scr_scroll_text (int row1, int row2, int count, int spec); 1494 int scr_scroll_text (int row1, int row2, int count);
1478 void scr_reset (); 1495 void scr_reset ();
1479 void scr_reset_realloc (); 1496 void scr_reset_realloc ();
1480 void scr_release (); 1497 void scr_release ();
1481 void scr_clear (bool really = false); 1498 void scr_clear (bool really = false);
1482 void scr_refresh (unsigned char refresh_type); 1499 void scr_refresh (unsigned char refresh_type);
… …
1490 void scr_touch (bool refresh); 1507 void scr_touch (bool refresh);
1491 void scr_expose (int x, int y, int width, int height, bool refresh); 1508 void scr_expose (int x, int y, int width, int height, bool refresh);
1492 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1509 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1493 void scr_recolour (); 1510 void scr_recolour ();
1494 void scr_remap_chars (); 1511 void scr_remap_chars ();
1495 void scr_remap_chars (text_t *tp, rend_t *rp); 1512 void scr_remap_chars (const line_t &l);
1496 1513
1497 void scr_poweron (); 1514 void scr_poweron ();
1498 void scr_cursor (int mode); 1515 void scr_cursor (int mode);
1499 void scr_do_wrap (); 1516 void scr_do_wrap ();
1500 int scr_change_screen (int scrn); 1517 int scr_change_screen (int scrn);

Diff Legend

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