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.161 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.165 by root, Tue Dec 20 22:27:49 2005 UTC

… …
818#define dDisp Display *disp = display->display 818#define dDisp Display *disp = display->display
819 819
820/* convert pixel dimensions to row/column values. Everything as int32_t */ 820/* convert pixel dimensions to row/column values. Everything as int32_t */
821#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 821#define Pixel2Col(x) Pixel2Width((int32_t)(x))
822#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 822#define Pixel2Row(y) Pixel2Height((int32_t)(y))
823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
825#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 825#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
826#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 826#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
829 829
830#define TermWin_TotalWidth() ((int32_t)TermWin.width) 830#define TermWin_TotalWidth() ((int32_t)this->width)
831#define TermWin_TotalHeight() ((int32_t)TermWin.height) 831#define TermWin_TotalHeight() ((int32_t)this->height)
832
833#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
834#define ROW(n) (save [LINENO (n)])
832 835
833/* how to build & extract colors and attributes */ 836/* how to build & extract colors and attributes */
834#define GET_BASEFG(x) (((x) & RS_fgMask)) 837#define GET_BASEFG(x) (((x) & RS_fgMask))
835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 838#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
836#ifndef NO_BRIGHTCOLOR 839#ifndef NO_BRIGHTCOLOR
… …
870 873
871#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 874#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
872#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 875#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
873 876
874#if ENABLE_STYLES 877#if ENABLE_STYLES
875# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 878# define FONTSET(style) fontset[GET_STYLE (style)]
876#else 879#else
877# define FONTSET(style) TermWin.fontset[0] 880# define FONTSET(style) fontset[0]
878#endif 881#endif
879 882
880#ifdef HAVE_SCROLLBARS 883#ifdef HAVE_SCROLLBARS
881# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 884# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
882#else 885#else
… …
907#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 910#define scrollbar_size() (scrollBar.end - scrollBar.beg \
908 - scrollbar_minheight ()) 911 - scrollbar_minheight ())
909 912
910#if (MENUBAR_MAX > 1) 913#if (MENUBAR_MAX > 1)
911/* rendition style flags */ 914/* rendition style flags */
912# define menuBar_height() (TermWin.fheight + SHADOW) 915# define menuBar_height() (fheight + SHADOW)
913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 916# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
914# define isMenuBarWindow(w) ((w) == menuBar.win) 917# define isMenuBarWindow(w) ((w) == menuBar.win)
915#else 918#else
916# define menuBar_height() (0) 919# define menuBar_height() (0)
917# define menuBar_TotalHeight() (0) 920# define menuBar_TotalHeight() (0)
… …
1348 int run_child (const char *const *argv); 1351 int run_child (const char *const *argv);
1349 1352
1350 void color_aliases (int idx); 1353 void color_aliases (int idx);
1351 void recolour_cursor (); 1354 void recolour_cursor ();
1352 void create_windows (int argc, const char *const *argv); 1355 void create_windows (int argc, const char *const *argv);
1353 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1356 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1354 void window_calc (unsigned int width, unsigned int height); 1357 void window_calc (unsigned int newwidth, unsigned int newheight);
1355 1358
1356#if USE_XIM 1359#if USE_XIM
1357 rxvt_xim *input_method; 1360 rxvt_xim *input_method;
1358 XIC Input_Context; 1361 XIC Input_Context;
1359 XIMStyle input_style; 1362 XIMStyle input_style;
… …
1431 void set_title (const char *str); 1434 void set_title (const char *str);
1432 void set_icon_name (const char *str); 1435 void set_icon_name (const char *str);
1433 void set_window_color (int idx, const char *color); 1436 void set_window_color (int idx, const char *color);
1434 void set_colorfgbg (); 1437 void set_colorfgbg ();
1435 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1438 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1436 void set_widthheight (unsigned int width, unsigned int height); 1439 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1437 1440
1438#ifdef MENUBAR 1441#ifdef MENUBAR
1439 // menubar.C 1442 // menubar.C
1440 void menuitem_free (menu_t *menu, menuitem_t *item); 1443 void menuitem_free (menu_t *menu, menuitem_t *item);
1441 int action_dispatch (action_t *action); 1444 int action_dispatch (action_t *action);
… …
1467 void menubar_control (XButtonEvent &ev); 1470 void menubar_control (XButtonEvent &ev);
1468 void map_menuBar (int map); 1471 void map_menuBar (int map);
1469#endif 1472#endif
1470 1473
1471 // screen.C 1474 // screen.C
1472 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1475
1473 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1476 void lalloc (line_t &l)
1477 {
1478 l.t = (text_t *)talloc->alloc ();
1479 l.r = (rend_t *)ralloc->alloc ();
1480 }
1481
1482 void lfree (line_t &l)
1483 {
1484 talloc->free (l.t);
1485 ralloc->free (l.r);
1486 }
1487
1488 void lresize (line_t &l)
1489 {
1490 if (!l.t)
1491 return;
1492
1493 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1494 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1495
1496 MIN_IT (l.l, (int16_t)ncol);
1497
1498 if (ncol > prev_ncol)
1499 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1500 }
1501
1502 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1503 void scr_blank_screen_mem (line_t &l, rend_t efs);
1474 int scr_scroll_text (int row1, int row2, int count, int spec); 1504 int scr_scroll_text (int row1, int row2, int count);
1475 void scr_reset (); 1505 void scr_reset ();
1476 void scr_reset_realloc (); 1506 void scr_reset_realloc ();
1477 void scr_release (); 1507 void scr_release ();
1478 void scr_clear (bool really = false); 1508 void scr_clear (bool really = false);
1479 void scr_refresh (unsigned char refresh_type); 1509 void scr_refresh (unsigned char refresh_type);
… …
1487 void scr_touch (bool refresh); 1517 void scr_touch (bool refresh);
1488 void scr_expose (int x, int y, int width, int height, bool refresh); 1518 void scr_expose (int x, int y, int width, int height, bool refresh);
1489 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1519 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1490 void scr_recolour (); 1520 void scr_recolour ();
1491 void scr_remap_chars (); 1521 void scr_remap_chars ();
1492 void scr_remap_chars (text_t *tp, rend_t *rp); 1522 void scr_remap_chars (const line_t &l);
1493 1523
1494 void scr_poweron (); 1524 void scr_poweron ();
1495 void scr_cursor (int mode); 1525 void scr_cursor (int mode);
1496 void scr_do_wrap (); 1526 void scr_do_wrap ();
1497 int scr_change_screen (int scrn); 1527 int scr_change_screen (int scrn);

Diff Legend

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