… | |
… | |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
|
|
32 | |
|
|
33 | #include <inttypes.h> |
31 | #include <inttypes.h> |
34 | |
32 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | |
34 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
38 | { |
36 | { |
39 | while (len--) |
37 | while (len--) |
40 | *start++ = value; |
38 | *start++ = value; |
41 | } |
39 | } |
42 | |
40 | |
… | |
… | |
161 | { |
159 | { |
162 | #if ENABLE_OVERLAY |
160 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
161 | scr_overlay_off (); |
164 | #endif |
162 | #endif |
165 | |
163 | |
|
|
164 | rvideo_mode = false; |
166 | view_start = 0; |
165 | view_start = 0; |
167 | num_scr = 0; |
166 | num_scr = 0; |
168 | |
167 | |
169 | if (ncol == 0) |
168 | if (ncol == 0) |
170 | ncol = 80; |
169 | ncol = 80; |
… | |
… | |
237 | selection.text = NULL; |
236 | selection.text = NULL; |
238 | selection.len = 0; |
237 | selection.len = 0; |
239 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
240 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
241 | selection.clicks = 0; |
240 | selection.clicks = 0; |
242 | rvideo_state = rvideo_mode = false; |
|
|
243 | } |
241 | } |
244 | else |
242 | else |
245 | { |
243 | { |
246 | /* |
244 | /* |
247 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
… | |
… | |
407 | CLEAR_ALL_SELECTION (); |
405 | CLEAR_ALL_SELECTION (); |
408 | |
406 | |
409 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
408 | prev_ncol = ncol; |
411 | |
409 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
410 | tabs = (char *)rxvt_malloc (ncol); |
413 | |
411 | |
414 | for (int col = ncol; --col; ) |
412 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
413 | tabs [col] = col % TABSIZE == 0; |
416 | |
414 | |
417 | if (current_screen != PRIMARY) |
415 | if (current_screen != PRIMARY) |
… | |
… | |
1623 | */ |
1621 | */ |
1624 | void |
1622 | void |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1623 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1626 | { |
1624 | { |
1627 | if (mode < 0) |
1625 | if (mode < 0) |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1626 | memset (tabs, 0, ncol); |
1629 | else if (screen.cur.col < ncol) |
1627 | else if (screen.cur.col < ncol) |
1630 | tabs [screen.cur.col] = !!mode; |
1628 | tabs [screen.cur.col] = !!mode; |
1631 | } |
1629 | } |
1632 | |
1630 | |
1633 | /* ------------------------------------------------------------------------- */ |
1631 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1648 | if (rvideo_state != on) |
1646 | if (rvideo_state != on) |
1649 | { |
1647 | { |
1650 | rvideo_state = on; |
1648 | rvideo_state = on; |
1651 | |
1649 | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1650 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1651 | #ifdef HAVE_BG_PIXMAP |
1654 | if (bgPixmap.pixmap == None) |
1652 | if (bgPixmap.pixmap == None) |
1655 | #endif |
|
|
1656 | #if TRANSPARENT |
|
|
1657 | if (!option (Opt_transparent) || am_transparent == 0) |
|
|
1658 | #endif |
1653 | #endif |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1654 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1655 | |
1661 | XGCValues gcvalue; |
1656 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1806 | for (i = PART_BEG; i < RC_COUNT; i++) |
1801 | for (i = PART_BEG; i < RC_COUNT; i++) |
1807 | { |
1802 | { |
1808 | min_it (rc[i].col, ncol - 1); |
1803 | min_it (rc[i].col, ncol - 1); |
1809 | min_it (rc[i].row, nrow - 1); |
1804 | min_it (rc[i].row, nrow - 1); |
1810 | } |
1805 | } |
1811 | |
1806 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1812 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1807 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1813 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1808 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1814 | |
1809 | |
1815 | num_scr_allow = 0; |
1810 | num_scr_allow = 0; |
1816 | |
1811 | |
… | |
… | |
1890 | # ifdef MAPALERT_OPTION |
1885 | # ifdef MAPALERT_OPTION |
1891 | if (option (Opt_mapAlert)) |
1886 | if (option (Opt_mapAlert)) |
1892 | # endif |
1887 | # endif |
1893 | XMapWindow (dpy, parent[0]); |
1888 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1889 | # endif |
|
|
1890 | |
1895 | # if ENABLE_FRILLS |
1891 | # if ENABLE_FRILLS |
1896 | if (option (Opt_urgentOnBell)) |
1892 | if (option (Opt_urgentOnBell)) |
1897 | { |
1893 | { |
1898 | XWMHints *h; |
|
|
1899 | |
|
|
1900 | h = XGetWMHints(dpy, parent[0]); |
1894 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
1901 | if (h != NULL) |
|
|
1902 | { |
1895 | { |
1903 | h->flags |= XUrgencyHint; |
1896 | h->flags |= XUrgencyHint; |
1904 | XSetWMHints(dpy, parent[0], h); |
1897 | XSetWMHints (dpy, parent[0], h); |
1905 | } |
1898 | } |
1906 | } |
1899 | } |
1907 | # endif |
1900 | # endif |
1908 | |
1901 | |
1909 | if (option (Opt_visualBell)) |
1902 | if (option (Opt_visualBell)) |
… | |
… | |
1914 | |
1907 | |
1915 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1908 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1916 | } |
1909 | } |
1917 | else |
1910 | else |
1918 | XBell (dpy, 0); |
1911 | XBell (dpy, 0); |
1919 | |
|
|
1920 | #endif |
1912 | #endif |
1921 | } |
1913 | } |
1922 | |
1914 | |
1923 | /* ------------------------------------------------------------------------- */ |
1915 | /* ------------------------------------------------------------------------- */ |
1924 | /* ARGSUSED */ |
1916 | /* ARGSUSED */ |
… | |
… | |
2005 | * A: set up vars |
1997 | * A: set up vars |
2006 | */ |
1998 | */ |
2007 | have_bg = 0; |
1999 | have_bg = 0; |
2008 | refresh_count = 0; |
2000 | refresh_count = 0; |
2009 | |
2001 | |
2010 | #if XPM_BACKGROUND |
2002 | #ifdef HAVE_BG_PIXMAP |
2011 | have_bg |= bgPixmap.pixmap != None; |
2003 | have_bg |= bgPixmap.pixmap != None; |
2012 | #endif |
|
|
2013 | #if TRANSPARENT |
|
|
2014 | have_bg |= option (Opt_transparent) && am_transparent; |
|
|
2015 | #endif |
2004 | #endif |
2016 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2005 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2017 | |
2006 | |
2018 | /* |
2007 | /* |
2019 | * B: reverse any characters which are selected |
2008 | * B: reverse any characters which are selected |
… | |
… | |
2481 | } |
2470 | } |
2482 | |
2471 | |
2483 | void |
2472 | void |
2484 | rxvt_term::scr_recolour () NOTHROW |
2473 | rxvt_term::scr_recolour () NOTHROW |
2485 | { |
2474 | { |
2486 | if (1 |
2475 | #ifdef HAVE_BG_PIXMAP |
2487 | #if TRANSPARENT |
2476 | bgPixmap.apply (); |
2488 | && !am_transparent |
2477 | #else |
2489 | #endif |
|
|
2490 | #if XPM_BACKGROUND |
|
|
2491 | && !bgPixmap.pixmap |
|
|
2492 | #endif |
|
|
2493 | ) |
|
|
2494 | { |
|
|
2495 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2478 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2496 | XClearWindow (dpy, parent[0]); |
2479 | XClearWindow (dpy, parent[0]); |
2497 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2480 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2498 | #if HAVE_SCROLLBARS |
2481 | # if HAVE_SCROLLBARS |
2499 | if (scrollBar.win) |
2482 | if (scrollBar.win) |
2500 | { |
2483 | { |
2501 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2484 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2502 | scrollBar.setIdle (); |
2485 | scrollBar.setIdle (); |
2503 | scrollbar_show (0); |
2486 | scrollbar_show (0); |
2504 | } |
2487 | } |
2505 | #endif |
2488 | # endif |
2506 | } |
2489 | #endif |
2507 | |
2490 | |
2508 | scr_clear (); |
2491 | scr_clear (); |
2509 | scr_touch (true); |
2492 | scr_touch (true); |
2510 | want_refresh = 1; |
2493 | want_refresh = 1; |
2511 | } |
2494 | } |
2512 | |
2495 | |