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.157 by root, Mon Jun 13 05:30:26 2005 UTC vs.
Revision 1.164 by root, Tue Dec 20 20:58:31 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 *****************************************************************************
… …
490 URxvt_view_down = 721, 491 URxvt_view_down = 721,
491}; 492};
492 493
493/* Words starting with `Color_' are colours. Others are counts */ 494/* Words starting with `Color_' are colours. Others are counts */
494/* 495/*
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 496 * The PixColor and rendition colour usage should probably be decoupled
498 * on the unnecessary items, e.g. Color_pointer, but won't bother 497 * 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 498 * until we need to. Also, be aware of usage in pixcolor_set
500 */ 499 */
501 500
502enum colour_list { 501enum colour_list {
… …
551 Color_scroll, 550 Color_scroll,
552 Color_trough, 551 Color_trough,
553#endif 552#endif
554#if TINTING 553#if TINTING
555 Color_tint, 554 Color_tint,
555#endif
556#if OFF_FOCUS_FADING
557 Color_fade,
556#endif 558#endif
557 NRS_COLORS, /* */ 559 NRS_COLORS, /* */
558#ifdef KEEP_SCROLLCOLOR 560#ifdef KEEP_SCROLLCOLOR
559 Color_topShadow = NRS_COLORS, 561 Color_topShadow = NRS_COLORS,
560 Color_bottomShadow, 562 Color_bottomShadow,
… …
816#define dDisp Display *disp = display->display 818#define dDisp Display *disp = display->display
817 819
818/* convert pixel dimensions to row/column values. Everything as int32_t */ 820/* convert pixel dimensions to row/column values. Everything as int32_t */
819#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 821#define Pixel2Col(x) Pixel2Width((int32_t)(x))
820#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 822#define Pixel2Row(y) Pixel2Height((int32_t)(y))
821#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
822#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
823#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 825#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
824#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 826#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
825#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
826#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
827 829
828#define TermWin_TotalWidth() ((int32_t)TermWin.width) 830#define TermWin_TotalWidth() ((int32_t)width)
829#define TermWin_TotalHeight() ((int32_t)TermWin.height) 831#define TermWin_TotalHeight() ((int32_t)height)
830 832
831/* how to build & extract colors and attributes */ 833/* how to build & extract colors and attributes */
832#define GET_BASEFG(x) (((x) & RS_fgMask)) 834#define GET_BASEFG(x) (((x) & RS_fgMask))
833#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
834#ifndef NO_BRIGHTCOLOR 836#ifndef NO_BRIGHTCOLOR
… …
868 870
869#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)))
870#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)))
871 873
872#if ENABLE_STYLES 874#if ENABLE_STYLES
873# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 875# define FONTSET(style) fontset[GET_STYLE (style)]
874#else 876#else
875# define FONTSET(style) TermWin.fontset[0] 877# define FONTSET(style) fontset[0]
876#endif 878#endif
877 879
878#ifdef HAVE_SCROLLBARS 880#ifdef HAVE_SCROLLBARS
879# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 881# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
880#else 882#else
… …
905#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 907#define scrollbar_size() (scrollBar.end - scrollBar.beg \
906 - scrollbar_minheight ()) 908 - scrollbar_minheight ())
907 909
908#if (MENUBAR_MAX > 1) 910#if (MENUBAR_MAX > 1)
909/* rendition style flags */ 911/* rendition style flags */
910# define menuBar_height() (TermWin.fheight + SHADOW) 912# define menuBar_height() (fheight + SHADOW)
911# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
912# define isMenuBarWindow(w) ((w) == menuBar.win) 914# define isMenuBarWindow(w) ((w) == menuBar.win)
913#else 915#else
914# define menuBar_height() (0) 916# define menuBar_height() (0)
915# define menuBar_TotalHeight() (0) 917# define menuBar_TotalHeight() (0)
… …
1227 void scr_overlay_off (); 1229 void scr_overlay_off ();
1228 void scr_overlay_set (int x, int y, 1230 void scr_overlay_set (int x, int y,
1229 text_t text, 1231 text_t text,
1230 rend_t rend = OVERLAY_RSTYLE); 1232 rend_t rend = OVERLAY_RSTYLE);
1231 void scr_overlay_set (int x, int y, const char *s); 1233 void scr_overlay_set (int x, int y, const char *s);
1234 void scr_overlay_set (int x, int y, const wchar_t *s);
1232#endif 1235#endif
1233 1236
1234 vector<void *> allocated; // free these memory blocks with free() 1237 vector<void *> allocated; // free these memory blocks with free()
1235 1238
1236 char *env_windowid; /* environmental variable WINDOWID */ 1239 char *env_windowid; /* environmental variable WINDOWID */
… …
1276#if TRANSPARENT 1279#if TRANSPARENT
1277 void rootwin_cb (XEvent &xev); 1280 void rootwin_cb (XEvent &xev);
1278 xevent_watcher rootwin_ev; 1281 xevent_watcher rootwin_ev;
1279#endif 1282#endif
1280 1283
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); 1284 void x_cb (XEvent &xev);
1286 xevent_watcher termwin_ev; 1285 xevent_watcher termwin_ev;
1287 xevent_watcher vt_ev; 1286 xevent_watcher vt_ev;
1288#ifdef HAVE_SCROLLBARS 1287#ifdef HAVE_SCROLLBARS
1289 xevent_watcher scrollbar_ev; 1288 xevent_watcher scrollbar_ev;
… …
1349 int run_child (const char *const *argv); 1348 int run_child (const char *const *argv);
1350 1349
1351 void color_aliases (int idx); 1350 void color_aliases (int idx);
1352 void recolour_cursor (); 1351 void recolour_cursor ();
1353 void create_windows (int argc, const char *const *argv); 1352 void create_windows (int argc, const char *const *argv);
1354 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);
1355 void window_calc (unsigned int width, unsigned int height); 1354 void window_calc (unsigned int newwidth, unsigned int newheight);
1356 1355
1357#if USE_XIM 1356#if USE_XIM
1358 rxvt_xim *input_method; 1357 rxvt_xim *input_method;
1359 XIC Input_Context; 1358 XIC Input_Context;
1360 XIMStyle input_style; 1359 XIMStyle input_style;
… …
1432 void set_title (const char *str); 1431 void set_title (const char *str);
1433 void set_icon_name (const char *str); 1432 void set_icon_name (const char *str);
1434 void set_window_color (int idx, const char *color); 1433 void set_window_color (int idx, const char *color);
1435 void set_colorfgbg (); 1434 void set_colorfgbg ();
1436 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1435 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1437 void set_widthheight (unsigned int width, unsigned int height); 1436 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1438 1437
1439#ifdef MENUBAR 1438#ifdef MENUBAR
1440 // menubar.C 1439 // menubar.C
1441 void menuitem_free (menu_t *menu, menuitem_t *item); 1440 void menuitem_free (menu_t *menu, menuitem_t *item);
1442 int action_dispatch (action_t *action); 1441 int action_dispatch (action_t *action);
… …
1468 void menubar_control (XButtonEvent &ev); 1467 void menubar_control (XButtonEvent &ev);
1469 void map_menuBar (int map); 1468 void map_menuBar (int map);
1470#endif 1469#endif
1471 1470
1472 // screen.C 1471 // screen.C
1473 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1472
1474 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_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1500 void scr_blank_screen_mem (line_t &l, rend_t efs);
1475 int scr_scroll_text (int row1, int row2, int count, int spec); 1501 int scr_scroll_text (int row1, int row2, int count);
1476 void scr_reset (); 1502 void scr_reset ();
1477 void scr_reset_realloc (); 1503 void scr_reset_realloc ();
1478 void scr_release (); 1504 void scr_release ();
1479 void scr_clear (bool really = false); 1505 void scr_clear (bool really = false);
1480 void scr_refresh (unsigned char refresh_type); 1506 void scr_refresh (unsigned char refresh_type);
… …
1488 void scr_touch (bool refresh); 1514 void scr_touch (bool refresh);
1489 void scr_expose (int x, int y, int width, int height, bool refresh); 1515 void scr_expose (int x, int y, int width, int height, bool refresh);
1490 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1516 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1491 void scr_recolour (); 1517 void scr_recolour ();
1492 void scr_remap_chars (); 1518 void scr_remap_chars ();
1493 void scr_remap_chars (text_t *tp, rend_t *rp); 1519 void scr_remap_chars (const line_t &l);
1494 1520
1495 void scr_poweron (); 1521 void scr_poweron ();
1496 void scr_cursor (int mode); 1522 void scr_cursor (int mode);
1497 void scr_do_wrap (); 1523 void scr_do_wrap ();
1498 int scr_change_screen (int scrn); 1524 int scr_change_screen (int scrn);

Diff Legend

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