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.160 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.162 by root, Sun Dec 18 00:59:42 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)width)
831#define TermWin_TotalHeight() ((int32_t)TermWin.height) 831#define TermWin_TotalHeight() ((int32_t)height)
832 832
833/* how to build & extract colors and attributes */ 833/* how to build & extract colors and attributes */
834#define GET_BASEFG(x) (((x) & RS_fgMask)) 834#define GET_BASEFG(x) (((x) & RS_fgMask))
835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
836#ifndef NO_BRIGHTCOLOR 836#ifndef NO_BRIGHTCOLOR
… …
870 870
871#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 871#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))) 872#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
873 873
874#if ENABLE_STYLES 874#if ENABLE_STYLES
875# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 875# define FONTSET(style) fontset[GET_STYLE (style)]
876#else 876#else
877# define FONTSET(style) TermWin.fontset[0] 877# define FONTSET(style) fontset[0]
878#endif 878#endif
879 879
880#ifdef HAVE_SCROLLBARS 880#ifdef HAVE_SCROLLBARS
881# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 881# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
882#else 882#else
… …
907#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 907#define scrollbar_size() (scrollBar.end - scrollBar.beg \
908 - scrollbar_minheight ()) 908 - scrollbar_minheight ())
909 909
910#if (MENUBAR_MAX > 1) 910#if (MENUBAR_MAX > 1)
911/* rendition style flags */ 911/* rendition style flags */
912# define menuBar_height() (TermWin.fheight + SHADOW) 912# define menuBar_height() (fheight + SHADOW)
913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
914# define isMenuBarWindow(w) ((w) == menuBar.win) 914# define isMenuBarWindow(w) ((w) == menuBar.win)
915#else 915#else
916# define menuBar_height() (0) 916# define menuBar_height() (0)
917# define menuBar_TotalHeight() (0) 917# define menuBar_TotalHeight() (0)
… …
1279#if TRANSPARENT 1279#if TRANSPARENT
1280 void rootwin_cb (XEvent &xev); 1280 void rootwin_cb (XEvent &xev);
1281 xevent_watcher rootwin_ev; 1281 xevent_watcher rootwin_ev;
1282#endif 1282#endif
1283 1283
1284
1285 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1286 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1287
1288 void x_cb (XEvent &xev); 1284 void x_cb (XEvent &xev);
1289 xevent_watcher termwin_ev; 1285 xevent_watcher termwin_ev;
1290 xevent_watcher vt_ev; 1286 xevent_watcher vt_ev;
1291#ifdef HAVE_SCROLLBARS 1287#ifdef HAVE_SCROLLBARS
1292 xevent_watcher scrollbar_ev; 1288 xevent_watcher scrollbar_ev;
… …
1352 int run_child (const char *const *argv); 1348 int run_child (const char *const *argv);
1353 1349
1354 void color_aliases (int idx); 1350 void color_aliases (int idx);
1355 void recolour_cursor (); 1351 void recolour_cursor ();
1356 void create_windows (int argc, const char *const *argv); 1352 void create_windows (int argc, const char *const *argv);
1357 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1353 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1358 void window_calc (unsigned int width, unsigned int height); 1354 void window_calc (unsigned int newwidth, unsigned int newheight);
1359 1355
1360#if USE_XIM 1356#if USE_XIM
1361 rxvt_xim *input_method; 1357 rxvt_xim *input_method;
1362 XIC Input_Context; 1358 XIC Input_Context;
1363 XIMStyle input_style; 1359 XIMStyle input_style;
… …
1435 void set_title (const char *str); 1431 void set_title (const char *str);
1436 void set_icon_name (const char *str); 1432 void set_icon_name (const char *str);
1437 void set_window_color (int idx, const char *color); 1433 void set_window_color (int idx, const char *color);
1438 void set_colorfgbg (); 1434 void set_colorfgbg ();
1439 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1435 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1440 void set_widthheight (unsigned int width, unsigned int height); 1436 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1441 1437
1442#ifdef MENUBAR 1438#ifdef MENUBAR
1443 // menubar.C 1439 // menubar.C
1444 void menuitem_free (menu_t *menu, menuitem_t *item); 1440 void menuitem_free (menu_t *menu, menuitem_t *item);
1445 int action_dispatch (action_t *action); 1441 int action_dispatch (action_t *action);
… …
1471 void menubar_control (XButtonEvent &ev); 1467 void menubar_control (XButtonEvent &ev);
1472 void map_menuBar (int map); 1468 void map_menuBar (int map);
1473#endif 1469#endif
1474 1470
1475 // screen.C 1471 // screen.C
1476 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1472
1477 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1473 void lalloc (line_t &l)
1474 {
1475 l.t = (text_t *)talloc->alloc ();
1476 l.r = (rend_t *)ralloc->alloc ();
1477 }
1478
1479 void lfree (line_t &l)
1480 {
1481 talloc->free (l.t);
1482 ralloc->free (l.r);
1483 }
1484
1485 void lresize (line_t &l)
1486 {
1487 if (!l.t)
1488 return;
1489
1490 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1491 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1492
1493 MIN_IT (l.l, (int16_t)ncol);
1494
1495 if (ncol > prev_ncol)
1496 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1497 }
1498
1499 void scr_update_term ();
1500 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1501 void scr_blank_screen_mem (line_t &l, rend_t efs);
1478 int scr_scroll_text (int row1, int row2, int count, int spec); 1502 int scr_scroll_text (int row1, int row2, int count, int spec);
1479 void scr_reset (); 1503 void scr_reset ();
1480 void scr_reset_realloc (); 1504 void scr_reset_realloc ();
1481 void scr_release (); 1505 void scr_release ();
1482 void scr_clear (bool really = false); 1506 void scr_clear (bool really = false);
… …
1491 void scr_touch (bool refresh); 1515 void scr_touch (bool refresh);
1492 void scr_expose (int x, int y, int width, int height, bool refresh); 1516 void scr_expose (int x, int y, int width, int height, bool refresh);
1493 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1517 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1494 void scr_recolour (); 1518 void scr_recolour ();
1495 void scr_remap_chars (); 1519 void scr_remap_chars ();
1496 void scr_remap_chars (text_t *tp, rend_t *rp); 1520 void scr_remap_chars (const line_t &l);
1497 1521
1498 void scr_poweron (); 1522 void scr_poweron ();
1499 void scr_cursor (int mode); 1523 void scr_cursor (int mode);
1500 void scr_do_wrap (); 1524 void scr_do_wrap ();
1501 int scr_change_screen (int scrn); 1525 int scr_change_screen (int scrn);

Diff Legend

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