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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.2 2003/11/24 17:31:27 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
22/* 23/*
23 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
24 */ 25 */
25 26
26#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
27#define INTERN_SCREEN 28#define INTERN_SCREEN
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "screen.intpro" /* PROTOS for internal routines */ 30#include "screen.intpro" /* PROTOS for internal routines */
30 31
31#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
32 33
33#include <stdint.h> 34#include <inttypes.h>
34#include <wchar.h> 35#include <wchar.h>
36
37#include "salloc.C" // HACK, should be a seperate compile!
35 38
36inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
37{ 40{
38 while (len--) 41 while (len--)
39 *start++ = value; 42 *start++ = value;
40} 43}
41 44
42#define RESET_CHSTAT(H) \
43 if ((H)->chstat == WBYTE) \
44 (H)->chstat = SBYTE, (H)->lost_multi = 1
45
46/* ------------------------------------------------------------------------- */ 45/* ------------------------------------------------------------------------- */
47#define PROP_SIZE 16384 46#define PROP_SIZE 16384
48#define TABSIZE 8 /* default tab size */ 47#define TABSIZE 8 /* default tab size */
49 48
50/* ------------------------------------------------------------------------- * 49/* ------------------------------------------------------------------------- *
51 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
52 * ------------------------------------------------------------------------- */ 51 * ------------------------------------------------------------------------- */
53#define ZERO_SCROLLBACK(R) \ 52#define ZERO_SCROLLBACK() \
54 if (((R)->Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 53 if (Options & Opt_scrollTtyOutput) \
55 (R)->TermWin.view_start = 0 54 TermWin.view_start = 0
56#define CLEAR_SELECTION(R) \ 55#define CLEAR_SELECTION() \
57 (R)->selection.beg.row = (R)->selection.beg.col \ 56 selection.beg.row = selection.beg.col \
58 = (R)->selection.end.row = (R)->selection.end.col = 0 57 = selection.end.row = selection.end.col = 0
59#define CLEAR_ALL_SELECTION(R) \ 58#define CLEAR_ALL_SELECTION() \
60 (R)->selection.beg.row = (R)->selection.beg.col \ 59 selection.beg.row = selection.beg.col \
61 = (R)->selection.mark.row = (R)->selection.mark.col \ 60 = selection.mark.row = selection.mark.col \
62 = (R)->selection.end.row = (R)->selection.end.col = 0 61 = selection.end.row = selection.end.col = 0
63 62
64#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
65 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 64 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
66#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
67 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 66 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
68#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
69 (((A) == (C)) && ((B) > (D))) 68 (((A) == (C)) && ((B) > (D)))
70#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
71 (((A) == (C)) && ((B) >= (D))) 70 (((A) == (C)) && ((B) >= (D)))
72#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
73 (((A) == (C)) && ((B) < (D))) 72 (((A) == (C)) && ((B) < (D)))
74#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
75 (((A) == (C)) && ((B) <= (D))) 74 (((A) == (C)) && ((B) <= (D)))
76 75
77/* these must be row_col_t */ 76/* these must be row_col_t */
78#define ROWCOL_IS_AFTER(X, Y) \ 77#define ROWCOL_IS_AFTER(X, Y) \
79 ROW_AND_COL_IS_AFTER((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
80#define ROWCOL_IS_BEFORE(X, Y) \ 79#define ROWCOL_IS_BEFORE(X, Y) \
81 ROW_AND_COL_IS_BEFORE((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
82#define ROWCOL_IN_ROW_AFTER(X, Y) \ 81#define ROWCOL_IN_ROW_AFTER(X, Y) \
83 ROW_AND_COL_IN_ROW_AFTER((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_BEFORE((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_AFTER((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
88#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
89 ROW_AND_COL_IN_ROW_AT_OR_BEFORE((X).row, (X).col, (Y).row, (Y).col) 88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
90 89
91/* 90/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 91 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 94 */
96#define drawBuffer (R->TermWin.vt) 95#define drawBuffer TermWin.vt
97 96
98#define CLEAR_ROWS(row, num) \ 97#define CLEAR_ROWS(row, num) \
99 if (R->TermWin.mapped) \ 98 if (TermWin.mapped) \
100 XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ 99 XClearArea (display->display, drawBuffer, 0, \
101 Row2Pixel(row), (unsigned int)R->TermWin.width, \ 100 Row2Pixel (row), (unsigned int)TermWin.width, \
102 (unsigned int)Height2Pixel(num), False) 101 (unsigned int)Height2Pixel (num), False)
103 102
104#define CLEAR_CHARS(x, y, num) \ 103#define CLEAR_CHARS(x, y, num) \
105 if (R->TermWin.mapped) \ 104 if (TermWin.mapped) \
106 XClearArea(R->Xdisplay, drawBuffer, x, y, \ 105 XClearArea (display->display, drawBuffer, x, y, \
107 (unsigned int)Width2Pixel(num), \ 106 (unsigned int)Width2Pixel (num), \
108 (unsigned int)Height2Pixel(1), False) 107 (unsigned int)Height2Pixel (1), False)
109 108
110#define ERASE_ROWS(row, num) \ 109#define ERASE_ROWS(row, num) \
111 XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ 110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
112 R->TermWin.int_bwidth, Row2Pixel(row), \ 111 0, Row2Pixel (row), \
113 (unsigned int)R->TermWin.width, \ 112 (unsigned int)TermWin.width, \
114 (unsigned int)Height2Pixel(num)) 113 (unsigned int)Height2Pixel (num))
115 114
116/* ------------------------------------------------------------------------- * 115/* ------------------------------------------------------------------------- *
117 * SCREEN `COMMON' ROUTINES * 116 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 117 * ------------------------------------------------------------------------- */
119/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
120/* INTPROTO */
121void 119void
122rxvt_blank_line(pR_ text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
123{ 121{
124 efs &= ~RS_baseattrMask; 122 efs &= ~RS_baseattrMask;
125 efs = SET_FONT (efs, R->TermWin.fontset->find_font (' ')); 123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);
126 124
127 while (width--) 125 while (width--)
128 { 126 {
129 *et++ = ' '; 127 *et++ = ' ';
130 *er++ = efs; 128 *er++ = efs;
131 } 129 }
132} 130}
133 131
134/* ------------------------------------------------------------------------- */ 132/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 133/* Fill a full line with blanks - make sure it is allocated first */
136/* INTPROTO */
137void 134void
138rxvt_blank_screen_mem(pR_ text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 135rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs)
139{ 136{
140 int width = R->TermWin.ncol;
141 rend_t *er;
142
143#ifdef DEBUG_STRICT 137#ifdef DEBUG_STRICT
144 assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); 138 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
145#endif 139#endif
146 if (tp[row] == NULL) { 140 if (tp[row] == NULL)
147 tp[row] = (text_t *)rxvt_malloc(sizeof(text_t) * width);
148 rp[row] = (rend_t *)rxvt_malloc(sizeof(rend_t) * width);
149 } 141 {
142 tp[row] = (text_t *)talloc->alloc ();
143 rp[row] = (rend_t *)ralloc->alloc ();
144 }
145
150 rxvt_blank_line (aR_ tp[row], rp[row], width, efs); 146 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
151} 147}
152 148
153/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
156/* EXTPROTO */
157void 152void
158rxvt_scr_reset(pR) 153rxvt_term::scr_reset ()
159{ 154{
160 unsigned int ncol, nrow, prev_ncol, prev_nrow, 155 unsigned int ncol, nrow, total_rows, prev_total_rows;
161 total_rows, prev_total_rows;
162 unsigned int p, q; 156 unsigned int p, q;
163 int k; 157 int k;
164 rend_t setrstyle; 158 rend_t setrstyle;
165 159
166 D_SCREEN((stderr, "rxvt_scr_reset()")); 160 D_SCREEN ((stderr, "rxvt_scr_reset ()"));
167 161
168 R->TermWin.view_start = 0; 162 TermWin.view_start = 0;
169 RESET_CHSTAT(R->h);
170 R->h->num_scr = 0; 163 num_scr = 0;
171 164
172 prev_ncol = R->h->prev_ncol;
173 prev_nrow = R->h->prev_nrow;
174 if (R->TermWin.ncol == 0) 165 if (TermWin.ncol == 0)
175 R->TermWin.ncol = 80; 166 TermWin.ncol = 80;
167
176 if (R->TermWin.nrow == 0) 168 if (TermWin.nrow == 0)
177 R->TermWin.nrow = 24; 169 TermWin.nrow = 24;
170
178 ncol = R->TermWin.ncol; 171 ncol = TermWin.ncol;
179 nrow = R->TermWin.nrow; 172 nrow = TermWin.nrow;
173
180 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
181 return; 175 return;
182 176
177 // we need at least two lines for wrapping to work correctly
178 if (nrow + TermWin.saveLines < 2)
179 {
180 TermWin.saveLines++;
181 prev_nrow--;
182 TermWin.nscrolled++;
183 }
184
183 R->h->want_refresh = 1; 185 want_refresh = 1;
184 186
185 total_rows = nrow + R->TermWin.saveLines;
186 prev_total_rows = prev_nrow + R->TermWin.saveLines; 187 prev_total_rows = prev_nrow + TermWin.saveLines;
188 total_rows = nrow + TermWin.saveLines;
187 189
188 R->screen.tscroll = 0; 190 screen.tscroll = 0;
189 R->screen.bscroll = nrow - 1; 191 screen.bscroll = nrow - 1;
190 192
191 if (prev_nrow == 0) { 193 if (!talloc)
192/* 194 {
195 talloc = new rxvt_salloc (ncol * sizeof (text_t));
196 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
197 }
198
199 if (!screen.text)
200 {
201 /*
193 * A: first time called so just malloc everything : don't rely on realloc 202 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL 203 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 204 */
196 R->screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 205 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
197 R->buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); 206 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 R->drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); 207 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
199 R->swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); 208 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
200 209
201 R->screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); 210 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
202 R->swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); 211 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
203 212
204 R->screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 213 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
205 R->buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); 214 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
206 R->drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 215 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
207 R->swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); 216 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
208 217
209 for (p = 0; p < nrow; p++) { 218 for (p = 0; p < nrow; p++)
219 {
210 q = p + R->TermWin.saveLines; 220 q = p + TermWin.saveLines;
211 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 221 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
212 q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
213 rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend,
214 p, DEFAULT_RSTYLE);
215 R->screen.tlen[q] = R->swap.tlen[p] = 0; 223 screen.tlen[q] = swap.tlen[p] = 0;
216 rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, 224 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 p, DEFAULT_RSTYLE); 225 }
218 } 226
219 MEMSET(R->h->charsets, 'B', sizeof(R->h->charsets)); 227 MEMSET (charsets, 'B', sizeof (charsets));
220 R->TermWin.nscrolled = 0; /* no saved lines */ 228 TermWin.nscrolled = 0; /* no saved lines */
221 R->h->rstyle = DEFAULT_RSTYLE; 229 rstyle = DEFAULT_RSTYLE;
222 R->screen.flags = Screen_DefaultFlags; 230 screen.flags = Screen_DefaultFlags;
223 R->screen.cur.row = R->screen.cur.col = 0; 231 screen.cur.row = screen.cur.col = 0;
224 R->screen.charset = 0; 232 screen.charset = 0;
225 R->h->current_screen = PRIMARY; 233 current_screen = PRIMARY;
226 rxvt_scr_cursor(aR_ SAVE); 234 scr_cursor (SAVE);
235
227#if NSCREENS 236#if NSCREENS
228 R->swap.flags = Screen_DefaultFlags; 237 swap.flags = Screen_DefaultFlags;
229 R->swap.cur.row = R->swap.cur.col = 0; 238 swap.cur.row = swap.cur.col = 0;
230 R->swap.charset = 0; 239 swap.charset = 0;
231 R->h->current_screen = SECONDARY; 240 current_screen = SECONDARY;
232 rxvt_scr_cursor(aR_ SAVE); 241 scr_cursor (SAVE);
233 R->h->current_screen = PRIMARY; 242 current_screen = PRIMARY;
234#endif 243#endif
244
235 R->selection.text = NULL; 245 selection.text = NULL;
236 R->selection.len = 0; 246 selection.len = 0;
237 R->selection.op = SELECTION_CLEAR; 247 selection.op = SELECTION_CLEAR;
238 R->selection.screen = PRIMARY; 248 selection.screen = PRIMARY;
239 R->selection.clicks = 0; 249 selection.clicks = 0;
240 CLEAR_ALL_SELECTION(R); 250 CLEAR_ALL_SELECTION ();
241 R->h->rvideo = 0; 251 rvideo = 0;
242 252 }
243 } else { 253 else
244/* 254 {
255 /*
245 * B1: add or delete rows as appropriate 256 * add or delete rows as appropriate
246 */ 257 */
247 setrstyle = DEFAULT_RSTYLE; 258 setrstyle = DEFAULT_RSTYLE;
248 259
249 if (nrow < prev_nrow) { 260 if (nrow < prev_nrow)
261 {
250 /* delete rows */ 262 /* delete rows */
251 k = min(R->TermWin.nscrolled, prev_nrow - nrow); 263 k = min (TermWin.nscrolled, prev_nrow - nrow);
252 rxvt_scroll_text(aR_ 0, (int)prev_nrow - 1, k, 1); 264 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
265
253 for (p = nrow; p < prev_nrow; p++) { 266 for (p = nrow; p < prev_nrow; p++)
254 q = p + R->TermWin.saveLines; 267 {
255 if (R->screen.text[q]) { 268 q = p + TermWin.saveLines;
269
270 if (screen.text[q])
271 {
256#ifdef DEBUG_STRICT 272#ifdef DEBUG_STRICT
257 assert(R->screen.rend[q]); 273 assert (screen.rend[q]);
258#endif 274#endif
259 free(R->screen.text[q]); 275 talloc->free (screen.text[q]);
260 free(R->screen.rend[q]); 276 ralloc->free (screen.rend[q]);
261 } 277 }
262 if (R->swap.text[p]) { 278
279 if (swap.text[p])
280 {
263#ifdef DEBUG_STRICT 281#ifdef DEBUG_STRICT
264 assert(R->swap.rend[p]); 282 assert (swap.rend[p]);
265#endif 283#endif
266 free(R->swap.text[p]); 284 talloc->free (swap.text[p]);
267 free(R->swap.rend[p]); 285 ralloc->free (swap.rend[p]);
268 } 286 }
287
269#ifdef DEBUG_STRICT 288#ifdef DEBUG_STRICT
270 assert(R->drawn_text[p] && R->drawn_rend[p]); 289 assert (drawn_text[p] && drawn_rend[p]);
271#endif 290#endif
272 free(R->drawn_text[p]); 291 talloc->free (drawn_text[p]);
273 free(R->drawn_rend[p]); 292 ralloc->free (drawn_rend[p]);
274 } 293 }
294
275 /* we have fewer rows so fix up cursor position */ 295 /* we have fewer rows so fix up cursor position */
276 MIN_IT(R->screen.cur.row, (int32_t)nrow - 1); 296 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
277 MIN_IT(R->swap.cur.row, (int32_t)nrow - 1); 297 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
278 298
279 rxvt_scr_reset_realloc(aR); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
280 300 }
281 } else if (nrow > prev_nrow) { 301 else if (nrow > prev_nrow)
302 {
282 /* add rows */ 303 /* add rows */
283 rxvt_scr_reset_realloc(aR); /* realloc _first_ */ 304 scr_reset_realloc (); /* realloc _first_ */
284 305
306 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
307
285 k = min(R->TermWin.nscrolled, nrow - prev_nrow); 308 k = min (TermWin.nscrolled, nrow - prev_nrow);
309
286 for (p = prev_total_rows; p < total_rows; p++) { 310 for (p = prev_total_rows; p < total_rows; p++)
287 R->screen.tlen[p] = 0; 311 {
288 R->screen.text[p] = NULL; 312 screen.tlen[p] = 0;
289 R->screen.rend[p] = NULL; 313 screen.text[p] = NULL;
290 } 314 screen.rend[p] = NULL;
315 }
316
291 for (p = prev_total_rows; p < total_rows - k; p++) 317 for (p = prev_total_rows; p < total_rows - k; p++)
292 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 318 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
293 p, setrstyle); 319
294 for (p = prev_nrow; p < nrow; p++) { 320 for (p = prev_nrow; p < nrow; p++)
295 R->swap.tlen[p] = 0; 321 {
296 R->swap.text[p] = NULL; 322 swap.tlen[p] = 0;
297 R->swap.rend[p] = NULL; 323 swap.text[p] = NULL;
298 R->drawn_text[p] = NULL; 324 swap.rend[p] = NULL;
299 R->drawn_rend[p] = NULL; 325 drawn_text[p] = NULL;
300 rxvt_blank_screen_mem(aR_ R->swap.text, R->swap.rend, 326 drawn_rend[p] = NULL;
301 p, setrstyle); 327 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
302 rxvt_blank_screen_mem(aR_ R->drawn_text, R->drawn_rend, 328 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
303 p, setrstyle); 329 }
304 } 330
305 if (k > 0) { 331 if (k > 0)
332 {
306 rxvt_scroll_text(aR_ 0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
307 R->screen.cur.row += k; 334 screen.cur.row += k;
308 R->screen.s_cur.row += k; 335 screen.s_cur.row += k;
309 R->TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
310 } 337 }
311#ifdef DEBUG_STRICT 338#ifdef DEBUG_STRICT
312 assert(R->screen.cur.row < R->TermWin.nrow); 339 assert (screen.cur.row < TermWin.nrow);
313 assert(R->swap.cur.row < R->TermWin.nrow); 340 assert (swap.cur.row < TermWin.nrow);
314#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
342
315 MIN_IT(R->screen.cur.row, nrow - 1); 343 MIN_IT (screen.cur.row, nrow - 1);
316 MIN_IT(R->swap.cur.row, nrow - 1); 344 MIN_IT (swap.cur.row, nrow - 1);
317#endif 345#endif
318 } 346 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
347 }
348
319/* B2: resize columns */ 349 /* resize columns */
320 if (ncol != prev_ncol) { 350 if (ncol != prev_ncol)
351 {
352 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
353 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
354
321 for (p = 0; p < total_rows; p++) { 355 for (p = 0; p < total_rows; p++)
322 if (R->screen.text[p]) { 356 {
357 if (screen.text[p])
358 {
323 R->screen.text[p] = (text_t *)rxvt_realloc(R->screen.text[p], ncol * sizeof(text_t)); 359 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
324 R->screen.rend[p] = (rend_t *)rxvt_realloc(R->screen.rend[p], ncol * sizeof(rend_t)); 360 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
361
325 MIN_IT(R->screen.tlen[p], (int16_t)ncol); 362 MIN_IT (screen.tlen[p], (int16_t)ncol);
363
326 if (ncol > prev_ncol) 364 if (ncol > prev_ncol)
327 rxvt_blank_line(aR_ 365 scr_blank_line (&screen.text[p][prev_ncol],
328 &(R->screen.text[p][prev_ncol]), 366 &screen.rend[p][prev_ncol],
329 &(R->screen.rend[p][prev_ncol]), 367 ncol - prev_ncol, setrstyle);
330 ncol - prev_ncol, 368 }
331 setrstyle); 369 }
332 } 370
371 for (p = 0; p < nrow; p++)
372 {
373 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
374 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
375
376 if (ncol > prev_ncol)
377 scr_blank_line (&drawn_text[p][prev_ncol],
378 &drawn_rend[p][prev_ncol],
379 ncol - prev_ncol, setrstyle);
380
381 if (swap.text[p])
382 {
383 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
384 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
385
386 MIN_IT (swap.tlen[p], (int16_t)ncol);
387
388 if (ncol > prev_ncol)
389 scr_blank_line (&swap.text[p][prev_ncol],
390 &swap.rend[p][prev_ncol],
391 ncol - prev_ncol, setrstyle);
392 }
393
394 }
395
396 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
397 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
398
399 delete talloc; talloc = ta;
400 delete ralloc; ralloc = ra;
401 }
402
403 if (tabs)
404 free (tabs);
333 } 405 }
334 for (p = 0; p < nrow; p++) {
335 R->drawn_text[p] = (text_t *)rxvt_realloc(R->drawn_text[p], ncol * sizeof(text_t));
336 R->drawn_rend[p] = (rend_t *)rxvt_realloc(R->drawn_rend[p], ncol * sizeof(rend_t));
337 if (R->swap.text[p]) {
338 R->swap.text[p] = (text_t *)rxvt_realloc(R->swap.text[p], ncol * sizeof(text_t));
339 R->swap.rend[p] = (rend_t *)rxvt_realloc(R->swap.rend[p], ncol * sizeof(rend_t));
340 MIN_IT(R->swap.tlen[p], (int16_t)ncol);
341 if (ncol > prev_ncol)
342 rxvt_blank_line(aR_
343 &(R->swap.text[p][prev_ncol]),
344 &(R->swap.rend[p][prev_ncol]),
345 ncol - prev_ncol, setrstyle);
346 }
347 if (ncol > prev_ncol)
348 rxvt_blank_line(aR_
349 &(R->drawn_text[p][prev_ncol]),
350 &(R->drawn_rend[p][prev_ncol]),
351 ncol - prev_ncol, setrstyle);
352 }
353 MIN_IT(R->screen.cur.col, (int16_t)ncol - 1);
354 MIN_IT(R->swap.cur.col, (int16_t)ncol - 1);
355 }
356 if (R->tabs)
357 free(R->tabs);
358 }
359 406
407 prev_nrow = nrow;
408 prev_ncol = ncol;
409
360 R->tabs = (char *)rxvt_malloc(ncol * sizeof(char)); 410 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
361 411
362 for (p = 0; p < ncol; p++) 412 for (p = 0; p < ncol; p++)
363 R->tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 413 tabs[p] = (p % TABSIZE == 0) ? 1 : 0;
364 414
365 R->h->prev_nrow = nrow; 415 tt_winch ();
366 R->h->prev_ncol = ncol;
367
368 rxvt_tt_winsize(R->cmd_fd, R->TermWin.ncol, R->TermWin.nrow, R->h->cmd_pid);
369} 416}
370 417
371/* INTPROTO */
372void 418void
373rxvt_scr_reset_realloc(pR) 419rxvt_term::scr_reset_realloc ()
374{ 420{
375 uint16_t total_rows, nrow; 421 uint16_t total_rows, nrow;
376 422
377 nrow = R->TermWin.nrow; 423 nrow = TermWin.nrow;
378 total_rows = nrow + R->TermWin.saveLines; 424 total_rows = nrow + TermWin.saveLines;
379/* *INDENT-OFF* */ 425 /* *INDENT-OFF* */
380 R->screen.text = (text_t **)rxvt_realloc(R->screen.text, total_rows * sizeof(text_t *)); 426 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
381 R->buf_text = (text_t **)rxvt_realloc(R->buf_text , total_rows * sizeof(text_t *)); 427 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
382 R->drawn_text = (text_t **)rxvt_realloc(R->drawn_text , nrow * sizeof(text_t *)); 428 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
383 R->swap.text = (text_t **)rxvt_realloc(R->swap.text , nrow * sizeof(text_t *)); 429 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
384 430
385 R->screen.tlen = (int16_t *)rxvt_realloc(R->screen.tlen, total_rows * sizeof(int16_t)); 431 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
386 R->swap.tlen = (int16_t *)rxvt_realloc(R->swap.tlen , total_rows * sizeof(int16_t)); 432 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
387 433
388 R->screen.rend = (rend_t **)rxvt_realloc(R->screen.rend, total_rows * sizeof(rend_t *)); 434 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
389 R->buf_rend = (rend_t **)rxvt_realloc(R->buf_rend , total_rows * sizeof(rend_t *)); 435 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
390 R->drawn_rend = (rend_t **)rxvt_realloc(R->drawn_rend , nrow * sizeof(rend_t *)); 436 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
391 R->swap.rend = (rend_t **)rxvt_realloc(R->swap.rend , nrow * sizeof(rend_t *)); 437 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
392/* *INDENT-ON* */ 438 /* *INDENT-ON* */
393} 439}
394 440
395/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
396/* 442/*
397 * Free everything. That way malloc debugging can find leakage. 443 * Free everything. That way malloc debugging can find leakage.
398 */ 444 */
399/* EXTPROTO */
400void 445void
401rxvt_scr_release(pR) 446rxvt_term::scr_release ()
402{ 447{
403 uint16_t total_rows; 448 uint16_t total_rows;
404 int i; 449 int i;
405 450
406 total_rows = R->TermWin.nrow + R->TermWin.saveLines; 451 total_rows = TermWin.nrow + TermWin.saveLines;
407 for (i = 0; i < total_rows; i++) { 452
408 if (R->screen.text[i]) { /* then so is R->screen.rend[i] */ 453 delete talloc; talloc = 0;
409 free(R->screen.text[i]); 454 delete ralloc; ralloc = 0;
410#ifdef DEBUG_STRICT 455
411 assert(R->screen.rend[i]);
412#endif
413 free(R->screen.rend[i]);
414 }
415 }
416 for (i = 0; i < R->TermWin.nrow; i++) {
417 free(R->drawn_text[i]);
418 free(R->drawn_rend[i]);
419 free(R->swap.text[i]);
420 free(R->swap.rend[i]);
421 }
422 free(R->screen.text); 456 free (screen.text);
423 free(R->screen.tlen); 457 free (screen.tlen);
424 free(R->screen.rend); 458 free (screen.rend);
425 free(R->drawn_text); 459 free (drawn_text);
426 free(R->drawn_rend); 460 free (drawn_rend);
427 free(R->swap.text); 461 free (swap.text);
428 free(R->swap.tlen); 462 free (swap.tlen);
429 free(R->swap.rend); 463 free (swap.rend);
430 free(R->buf_text); 464 free (buf_text);
431 free(R->buf_rend); 465 free (buf_rend);
432 free(R->tabs); 466 free (tabs);
433 467
434/* NULL these so if anything tries to use them, we'll know about it */ 468 /* NULL these so if anything tries to use them, we'll know about it */
435 R->screen.text = R->drawn_text = R->swap.text = NULL; 469 screen.text = drawn_text = swap.text = NULL;
436 R->screen.rend = R->drawn_rend = R->swap.rend = NULL; 470 screen.rend = drawn_rend = swap.rend = NULL;
437 R->screen.tlen = R->swap.tlen = NULL; 471 screen.tlen = swap.tlen = NULL;
438 R->buf_text = NULL; 472 buf_text = NULL;
439 R->buf_rend = NULL; 473 buf_rend = NULL;
440 R->tabs = NULL; 474 tabs = NULL;
441} 475}
442 476
443/* ------------------------------------------------------------------------- */ 477/* ------------------------------------------------------------------------- */
444/* 478/*
445 * Hard reset 479 * Hard reset
446 */ 480 */
447/* EXTPROTO */
448void 481void
449rxvt_scr_poweron(pR) 482rxvt_term::scr_poweron ()
450{ 483{
451 D_SCREEN((stderr, "rxvt_scr_poweron()")); 484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
452 485
453 rxvt_scr_release(aR); 486 scr_release ();
454 R->h->prev_nrow = R->h->prev_ncol = 0; 487 prev_nrow = prev_ncol = 0;
455 rxvt_scr_reset(aR); 488 scr_reset ();
456 489
457 rxvt_scr_clear(aR); 490 scr_clear (true);
458 rxvt_scr_refresh(aR_ SLOW_REFRESH); 491 scr_refresh (SLOW_REFRESH);
459#ifdef RXVT_GRAPHICS
460 rxvt_Gr_reset(aR);
461#endif
462} 492}
463 493
464/* ------------------------------------------------------------------------- * 494/* ------------------------------------------------------------------------- *
465 * PROCESS SCREEN COMMANDS * 495 * PROCESS SCREEN COMMANDS *
466 * ------------------------------------------------------------------------- */ 496 * ------------------------------------------------------------------------- */
467/* 497/*
468 * Save and Restore cursor 498 * Save and Restore cursor
469 * XTERM_SEQ: Save cursor : ESC 7 499 * XTERM_SEQ: Save cursor : ESC 7
470 * XTERM_SEQ: Restore cursor: ESC 8 500 * XTERM_SEQ: Restore cursor: ESC 8
471 */ 501 */
472/* EXTPROTO */
473void 502void
474rxvt_scr_cursor(pR_ int mode) 503rxvt_term::scr_cursor (int mode)
475{ 504{
476 screen_t *s; 505 screen_t *s;
477 506
478 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); 507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
479 508
480#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
481 if (R->h->current_screen == SECONDARY) 510 if (current_screen == SECONDARY)
482 s = &(R->swap); 511 s = &swap;
483 else 512 else
484#endif 513#endif
485 s = &(R->screen); 514 s = &screen;
515
486 switch (mode) { 516 switch (mode)
517 {
487 case SAVE: 518 case SAVE:
488 s->s_cur.row = s->cur.row; 519 s->s_cur.row = s->cur.row;
489 s->s_cur.col = s->cur.col; 520 s->s_cur.col = s->cur.col;
490 s->s_rstyle = R->h->rstyle; 521 s->s_rstyle = rstyle;
491 s->s_charset = s->charset; 522 s->s_charset = s->charset;
492 s->s_charset_char = R->h->charsets[s->charset]; 523 s->s_charset_char = charsets[s->charset];
493 break; 524 break;
525
494 case RESTORE: 526 case RESTORE:
495 R->h->want_refresh = 1; 527 want_refresh = 1;
496 s->cur.row = s->s_cur.row; 528 s->cur.row = s->s_cur.row;
497 s->cur.col = s->s_cur.col; 529 s->cur.col = s->s_cur.col;
498 s->flags &= ~Screen_WrapNext; 530 s->flags &= ~Screen_WrapNext;
499 R->h->rstyle = s->s_rstyle; 531 rstyle = s->s_rstyle;
500 s->charset = s->s_charset; 532 s->charset = s->s_charset;
501 R->h->charsets[s->charset] = s->s_charset_char; 533 charsets[s->charset] = s->s_charset_char;
502 rxvt_set_font_style(aR); 534 set_font_style ();
503 break; 535 break;
504 } 536 }
537
505/* boundary check in case screen size changed between SAVE and RESTORE */ 538 /* boundary check in case screen size changed between SAVE and RESTORE */
506 MIN_IT(s->cur.row, R->TermWin.nrow - 1); 539 MIN_IT (s->cur.row, TermWin.nrow - 1);
507 MIN_IT(s->cur.col, R->TermWin.ncol - 1); 540 MIN_IT (s->cur.col, TermWin.ncol - 1);
508#ifdef DEBUG_STRICT 541#ifdef DEBUG_STRICT
509 assert(s->cur.row >= 0); 542 assert (s->cur.row >= 0);
510 assert(s->cur.col >= 0); 543 assert (s->cur.col >= 0);
511#else /* drive with your eyes closed */ 544#else /* drive with your eyes closed */
512 MAX_IT(s->cur.row, 0); 545 MAX_IT (s->cur.row, 0);
513 MAX_IT(s->cur.col, 0); 546 MAX_IT (s->cur.col, 0);
514#endif 547#endif
515} 548}
516 549
517/* ------------------------------------------------------------------------- */ 550/* ------------------------------------------------------------------------- */
518/* 551/*
519 * Swap between primary and secondary screens 552 * Swap between primary and secondary screens
520 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 553 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
521 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 554 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
522 */ 555 */
523/* EXTPROTO */
524int 556int
525rxvt_scr_change_screen(pR_ int scrn) 557rxvt_term::scr_change_screen (int scrn)
526{ 558{
527 int i; 559 int i;
528#if NSCREENS 560#if NSCREENS
529 int offset; 561 int offset;
530#endif 562#endif
531 563
532 R->h->want_refresh = 1; 564 want_refresh = 1;
533 565
534 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); 566 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
535 567
536 R->TermWin.view_start = 0; 568 TermWin.view_start = 0;
537 RESET_CHSTAT(R->h);
538 569
539 if (R->h->current_screen == scrn) 570 if (current_screen == scrn)
540 return R->h->current_screen; 571 return scrn;
541 572
542 rxvt_selection_check(aR_ 2); /* check for boundary cross */ 573 selection_check (2); /* check for boundary cross */
543 574
544 SWAP_IT(R->h->current_screen, scrn, int); 575 SWAP_IT (current_screen, scrn, int);
545#if NSCREENS 576#if NSCREENS
577 if (Options & Opt_secondaryScreen)
578 {
546 R->h->num_scr = 0; 579 num_scr = 0;
547 offset = R->TermWin.saveLines; 580 offset = TermWin.saveLines;
548 for (i = R->h->prev_nrow; i--;) { 581 for (i = prev_nrow; i--;)
582 {
549 SWAP_IT(R->screen.text[i + offset], R->swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
550 SWAP_IT(R->screen.tlen[i + offset], R->swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
551 SWAP_IT(R->screen.rend[i + offset], R->swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
552 } 586 }
553 SWAP_IT(R->screen.cur.row, R->swap.cur.row, int16_t); 587 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
554 SWAP_IT(R->screen.cur.col, R->swap.cur.col, int16_t); 588 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
555# ifdef DEBUG_STRICT 589# ifdef DEBUG_STRICT
556 assert((R->screen.cur.row >= 0) && (R->screen.cur.row < R->h->prev_nrow)); 590 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
557 assert((R->screen.cur.col >= 0) && (R->screen.cur.col < R->h->prev_ncol)); 591 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
558# else /* drive with your eyes closed */ 592# else /* drive with your eyes closed */
559 MAX_IT(R->screen.cur.row, 0); 593 MAX_IT (screen.cur.row, 0);
560 MIN_IT(R->screen.cur.row, (int32_t)R->h->prev_nrow - 1); 594 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
561 MAX_IT(R->screen.cur.col, 0); 595 MAX_IT (screen.cur.col, 0);
562 MIN_IT(R->screen.cur.col, (int32_t)R->h->prev_ncol - 1); 596 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
563# endif 597# endif
564 SWAP_IT(R->screen.charset, R->swap.charset, int16_t); 598 SWAP_IT (screen.charset, swap.charset, int16_t);
565 SWAP_IT(R->screen.flags, R->swap.flags, int); 599 SWAP_IT (screen.flags, swap.flags, int);
566 R->screen.flags |= Screen_VisibleCursor; 600 screen.flags |= Screen_VisibleCursor;
567 R->swap.flags |= Screen_VisibleCursor; 601 swap.flags |= Screen_VisibleCursor;
568
569# ifdef RXVT_GRAPHICS
570
571 if (rxvt_Gr_Displayed(aR)) {
572 rxvt_Gr_scroll(aR_ 0);
573 rxvt_Gr_ChangeScreen(aR);
574 } 602 }
603 else
575# endif 604#endif
576#else 605 if (Options & Opt_secondaryScroll)
577# ifdef SCROLL_ON_NO_SECONDARY
578# ifdef RXVT_GRAPHICS
579 if (rxvt_Gr_Displayed(aR))
580 rxvt_Gr_ClearScreen(aR);
581# endif
582 if (R->h->current_screen == PRIMARY 606 //if (current_screen == PRIMARY)
583# ifdef RXVT_GRAPHICS
584 && !rxvt_Gr_Displayed(aR)
585# endif
586 )
587 rxvt_scroll_text(aR_ 0, (R->h->prev_nrow - 1), R->h->prev_nrow, 0); 607 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
588# endif
589#endif
590 return scrn; 608 return scrn;
591} 609}
592 610
593/* ------------------------------------------------------------------------- */ 611/* ------------------------------------------------------------------------- */
594/* 612/*
595 * Change the colour for following text 613 * Change the colour for following text
596 */ 614 */
597/* EXTPROTO */
598void 615void
599rxvt_scr_color(pR_ unsigned int color, int fgbg) 616rxvt_term::scr_color (unsigned int color, int fgbg)
600{ 617{
601 color &= RS_fgMask; 618 color &= RS_fgMask;
602 if (fgbg == Color_fg) 619 if (fgbg == Color_fg)
603 R->h->rstyle = SET_FGCOLOR(R->h->rstyle, color); 620 rstyle = SET_FGCOLOR (rstyle, color);
604 else 621 else
605 R->h->rstyle = SET_BGCOLOR(R->h->rstyle, color); 622 rstyle = SET_BGCOLOR (rstyle, color);
606} 623}
607 624
608/* ------------------------------------------------------------------------- */ 625/* ------------------------------------------------------------------------- */
609/* 626/*
610 * Change the rendition style for following text 627 * Change the rendition style for following text
611 */ 628 */
612/* EXTPROTO */
613void 629void
614rxvt_scr_rendition(pR_ int set, int style) 630rxvt_term::scr_rendition (int set, int style)
615{ 631 {
616 if (set) 632 if (set)
617 R->h->rstyle |= style; 633 rstyle |= style;
618 else if (style == ~RS_None) 634 else if (style == ~RS_None)
619 R->h->rstyle = DEFAULT_RSTYLE; 635 rstyle = DEFAULT_RSTYLE;
620 else 636 else
621 R->h->rstyle &= ~style; 637 rstyle &= ~style;
622} 638 }
623 639
624/* ------------------------------------------------------------------------- */ 640/* ------------------------------------------------------------------------- */
625/* 641/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 642 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 643 * count positive ==> scroll up
628 * count negative ==> scroll down 644 * count negative ==> scroll down
629 * spec == 0 for normal routines 645 * spec == 0 for normal routines
630 */ 646 */
631/* EXTPROTO */
632int 647int
633rxvt_scroll_text(pR_ int row1, int row2, int count, int spec) 648rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)
634{ 649{
635 int i, j; 650 int i, j;
636 long nscrolled; 651 long nscrolled;
637 652
638 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
639 return 0; 654 return 0;
640 655
641 R->h->want_refresh = 1; 656 want_refresh = 1;
642 D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (R->h->current_screen == PRIMARY) ? "Primary" : "Secondary")); 657 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
643 658
644 if ((count > 0) && (row1 == 0) && (R->h->current_screen == PRIMARY)) { 659 if (row1 == 0 && count > 0
660 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
661 {
645 nscrolled = (long)R->TermWin.nscrolled + (long)count;; 662 nscrolled = (long)TermWin.nscrolled + (long)count;
663
646 if (nscrolled > (long)R->TermWin.saveLines) 664 if (nscrolled > (long)TermWin.saveLines)
647 R->TermWin.nscrolled = R->TermWin.saveLines; 665 TermWin.nscrolled = TermWin.saveLines;
648 else 666 else
649 R->TermWin.nscrolled = (uint16_t)nscrolled; 667 TermWin.nscrolled = (uint16_t)nscrolled;
668
650 if ((R->Options & Opt_scrollWithBuffer) 669 if ((Options & Opt_scrollWithBuffer)
651 && R->TermWin.view_start != 0 670 && TermWin.view_start != 0
652 && R->TermWin.view_start != R->TermWin.saveLines) 671 && TermWin.view_start != TermWin.saveLines)
653 rxvt_scr_page(aR_ UP, count); 672 scr_page (UP, count);
673 }
654 } else if (!spec) 674 else if (!spec)
655 row1 += R->TermWin.saveLines;
656 row2 += R->TermWin.saveLines; 675 row1 += TermWin.saveLines;
657 676
677 row2 += TermWin.saveLines;
678
658 if (R->selection.op && R->h->current_screen == R->selection.screen) { 679 if (selection.op && current_screen == selection.screen)
680 {
659 i = R->selection.beg.row + R->TermWin.saveLines; 681 i = selection.beg.row + TermWin.saveLines;
660 j = R->selection.end.row + R->TermWin.saveLines; 682 j = selection.end.row + TermWin.saveLines;
661 if ((i < row1 && j > row1) 683 if ((i < row1 && j > row1)
662 || (i < row2 && j > row2) 684 || (i < row2 && j > row2)
663 || (i - count < row1 && i >= row1) 685 || (i - count < row1 && i >= row1)
664 || (i - count > row2 && i <= row2) 686 || (i - count > row2 && i <= row2)
665 || (j - count < row1 && j >= row1) 687 || (j - count < row1 && j >= row1)
666 || (j - count > row2 && j <= row2)) { 688 || (j - count > row2 && j <= row2))
689 {
667 CLEAR_ALL_SELECTION(R); 690 CLEAR_ALL_SELECTION ();
668 R->selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 691 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
692 }
669 } else if (j >= row1 && j <= row2) { 693 else if (j >= row1 && j <= row2)
694 {
670 /* move selected region too */ 695 /* move selected region too */
671 R->selection.beg.row -= count; 696 selection.beg.row -= count;
672 R->selection.end.row -= count; 697 selection.end.row -= count;
673 R->selection.mark.row -= count; 698 selection.mark.row -= count;
674 } 699 }
675 } 700 }
701
676 rxvt_selection_check(aR_ 0); /* _after_ R->TermWin.nscrolled update */ 702 selection_check (0); /* _after_ TermWin.nscrolled update */
677 703
678 R->h->num_scr += count; 704 num_scr += count;
679 j = count; 705 j = count;
706
680 if (count < 0) 707 if (count < 0)
681 count = -count; 708 count = -count;
709
682 i = row2 - row1 + 1; 710 i = row2 - row1 + 1;
683 MIN_IT(count, i); 711 MIN_IT (count, i);
684 712
685 if (j > 0) { 713 if (j > 0)
714 {
686/* A: scroll up */ 715 /* A: scroll up */
687 716
688/* A1: Copy lines that will get clobbered by the rotation */ 717 /* A1: Copy lines that will get clobbered by the rotation */
689 for (i = 0, j = row1; i < count; i++, j++) { 718 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
690 R->buf_text[i] = R->screen.text[j]; 719 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
691 R->buf_rend[i] = R->screen.rend[j]; 720
692 }
693/* A2: Rotate lines */ 721 /* A2: Rotate lines */
694 for (j = row1, i = j + count; i <= row2; i++, j++) { 722 i = row2 - row1 - count + 1;
695 R->screen.tlen[j] = R->screen.tlen[i]; 723 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
696 R->screen.text[j] = R->screen.text[i]; 724 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
697 R->screen.rend[j] = R->screen.rend[i]; 725 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
698 } 726
699 j = row2 - count + 1, i = count; 727 j = row2 - count + 1, i = count;
728 }
700 } else /* if (j < 0) */ { 729 else /* if (j < 0) */
730 {
701/* B: scroll down */ 731 /* B: scroll down */
702 732
703/* B1: Copy lines that will get clobbered by the rotation */ 733 /* B1: Copy lines that will get clobbered by the rotation */
704 for (i = 0, j = row2; i < count; i++, j--) { 734 for (i = 0, j = row2; i < count; i++, j--)
705 R->buf_text[i] = R->screen.text[j]; 735 {
706 R->buf_rend[i] = R->screen.rend[j]; 736 buf_text[i] = screen.text[j];
707 } 737 buf_rend[i] = screen.rend[j];
738 }
739
708/* B2: Rotate lines */ 740 /* B2: Rotate lines */
709 for (j = row2, i = j - count; i >= row1; i--, j--) { 741 for (j = row2, i = j - count; i >= row1; i--, j--)
742 {
710 R->screen.tlen[j] = R->screen.tlen[i]; 743 screen.tlen[j] = screen.tlen[i];
711 R->screen.text[j] = R->screen.text[i]; 744 screen.text[j] = screen.text[i];
712 R->screen.rend[j] = R->screen.rend[i]; 745 screen.rend[j] = screen.rend[i];
713 } 746 }
747
714 j = row1, i = count; 748 j = row1, i = count;
715 count = -count; 749 count = -count;
716 } 750 }
717 751
718/* C: Resurrect lines */ 752 /* C: Resurrect lines */
753 memset (screen.tlen + j, 0, i * sizeof (int16_t));
754 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
755 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
756 if (!spec) /* line length may not equal TermWin.ncol */
719 for (; i--; j++) { 757 for (; i--; j++)
720 R->screen.tlen[j] = 0; 758 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
721 R->screen.text[j] = R->buf_text[i];
722 R->screen.rend[j] = R->buf_rend[i];
723 if (!spec) /* line length may not equal TermWin.ncol */
724 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend,
725 (unsigned int)j, R->h->rstyle);
726 }
727 759
728#ifdef RXVT_GRAPHICS
729 if (rxvt_Gr_Displayed(aR))
730 rxvt_Gr_scroll(aR_ count);
731#endif
732 return count; 760 return count;
733} 761}
734 762
735/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
736/* 764/*
737 * Add text given in <str> of length <len> to screen struct 765 * Add text given in <str> of length <len> to screen struct
738 */ 766 */
739/* EXTPROTO */
740void 767void
741rxvt_scr_add_lines(pR_ const uint32_t *str, int nlines, int len) 768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
742{ 769{
743 unsigned char checksel, clearsel; 770 unsigned char checksel, clearsel;
744 uint32_t c; 771 unicode_t c;
745 int i, row, last_col; 772 int i, row, last_col;
746 text_t *stp; 773 text_t *stp;
747 rend_t *srp; 774 rend_t *srp;
748 struct rxvt_hidden *h = R->h;
749 775
750 if (len <= 0) /* sanity */ 776 if (len <= 0) /* sanity */
751 return; 777 return;
752 778
753 h->want_refresh = 1; 779 want_refresh = 1;
754 last_col = R->TermWin.ncol; 780 last_col = TermWin.ncol;
755 781
756 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); 782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
757 ZERO_SCROLLBACK(R); 783 ZERO_SCROLLBACK ();
758 if (nlines > 0) { 784 if (nlines > 0)
785 {
759 nlines += (R->screen.cur.row - R->screen.bscroll); 786 nlines += screen.cur.row - screen.bscroll;
760 if ((nlines > 0) 787 if ((nlines > 0)
761 && (R->screen.tscroll == 0) 788 && (screen.tscroll == 0)
762 && (R->screen.bscroll == (R->TermWin.nrow - 1))) { 789 && (screen.bscroll == (TermWin.nrow - 1)))
790 {
763 /* _at least_ this many lines need to be scrolled */ 791 /* _at least_ this many lines need to be scrolled */
764 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, nlines, 792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
765 0); 793 screen.cur.row -= nlines;
766 R->screen.cur.row -= nlines; 794 }
767 }
768 } 795 }
796
769#ifdef DEBUG_STRICT 797#ifdef DEBUG_STRICT
770 assert(R->screen.cur.col < last_col); 798 assert (screen.cur.col < last_col);
771 assert((R->screen.cur.row < R->TermWin.nrow) 799 assert ((screen.cur.row < TermWin.nrow)
772 && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); 800 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
773#else /* drive with your eyes closed */ 801#else /* drive with your eyes closed */
774 MIN_IT(R->screen.cur.col, last_col - 1); 802 MIN_IT (screen.cur.col, last_col - 1);
775 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 803 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
776 MAX_IT(R->screen.cur.row, -(int32_t)R->TermWin.nscrolled); 804 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
777#endif 805#endif
778 row = R->screen.cur.row + R->TermWin.saveLines; 806 row = screen.cur.row + TermWin.saveLines;
779 807
780 checksel = (R->selection.op 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
781 && h->current_screen == R->selection.screen) ? 1 : 0;
782 clearsel = 0; 809 clearsel = 0;
783 810
784 stp = R->screen.text[row]; 811 stp = screen.text[row];
785 srp = R->screen.rend[row]; 812 srp = screen.rend[row];
786 813
787 for (i = 0; i < len;) { 814 while (len--)
788 c = str[i++]; 815 {
789 switch (c) { 816 c = *str++;
790 case '\t':
791 rxvt_scr_tab(aR_ 1);
792 continue;
793 case '\n':
794 if (R->screen.tlen[row] != -1) /* XXX: think about this */
795 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
796 R->screen.flags &= ~Screen_WrapNext;
797 if (R->screen.cur.row == R->screen.bscroll)
798 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0);
799 else if (R->screen.cur.row < (R->TermWin.nrow - 1))
800 row = (++R->screen.cur.row) + R->TermWin.saveLines;
801 stp = R->screen.text[row]; /* _must_ refresh */
802 srp = R->screen.rend[row]; /* _must_ refresh */
803 RESET_CHSTAT(h);
804 continue;
805 case '\r':
806 if (R->screen.tlen[row] != -1) /* XXX: think about this */
807 MAX_IT(R->screen.tlen[row], R->screen.cur.col);
808 R->screen.flags &= ~Screen_WrapNext;
809 R->screen.cur.col = 0;
810 RESET_CHSTAT(h);
811 continue;
812 default:
813 if (c == 127)
814 continue; /* yummmm..... */
815 break;
816 }
817 817
818 if (checksel /* see if we're writing within selection */ 818 if (c < 0x20)
819 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg)
820 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) {
821 checksel = 0;
822 clearsel = 1;
823 }
824 if (R->screen.flags & Screen_WrapNext) {
825 R->screen.tlen[row] = -1;
826 if (R->screen.cur.row == R->screen.bscroll)
827 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, 1, 0);
828 else if (R->screen.cur.row < (R->TermWin.nrow - 1))
829 row = (++R->screen.cur.row) + R->TermWin.saveLines;
830 stp = R->screen.text[row]; /* _must_ refresh */
831 srp = R->screen.rend[row]; /* _must_ refresh */
832 R->screen.cur.col = 0;
833 R->screen.flags &= ~Screen_WrapNext;
834 }
835 if (R->screen.flags & Screen_Insert)
836 rxvt_scr_insdel_chars(aR_ 1, INSERT);
837
838 if (R->h->charsets[R->screen.charset] == '0') // DEC SPECIAL
839 switch (c) 819 switch (c)
820 {
821 case C0_HT:
822 scr_tab (1);
823 continue;
824
825 case C0_LF:
826 if (screen.tlen[row] != -1) /* XXX: think about this */
827 MAX_IT (screen.tlen[row], screen.cur.col);
828
829 screen.flags &= ~Screen_WrapNext;
830
831 if (screen.cur.row == screen.bscroll)
832 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
833 else if (screen.cur.row < (TermWin.nrow - 1))
834 row = (++screen.cur.row) + TermWin.saveLines;
835
836 stp = screen.text[row]; /* _must_ refresh */
837 srp = screen.rend[row]; /* _must_ refresh */
838 continue;
839
840 case C0_CR:
841 if (screen.tlen[row] != -1) /* XXX: think about this */
842 MAX_IT (screen.tlen[row], screen.cur.col);
843
844 screen.flags &= ~Screen_WrapNext;
845 screen.cur.col = 0;
846 continue;
847 }
848
849 if (checksel /* see if we're writing within selection */
850 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
851 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
852 {
853 checksel = 0;
854 clearsel = 1;
855 }
856
857 if (screen.flags & Screen_WrapNext)
858 {
859 screen.tlen[row] = -1;
860 if (screen.cur.row == screen.bscroll)
861 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
862 else if (screen.cur.row < (TermWin.nrow - 1))
863 row = (++screen.cur.row) + TermWin.saveLines;
864
865 stp = screen.text[row]; /* _must_ refresh */
866 srp = screen.rend[row]; /* _must_ refresh */
867 screen.cur.col = 0;
868 screen.flags &= ~Screen_WrapNext;
869 }
870
871 if (screen.flags & Screen_Insert)
872 scr_insdel_chars (1, INSERT);
873
874 // rely on wcwidth to tell us the character width, at least for non-latin1
875 // do wcwidth before further replacements, as wcwidth says that line-drawing
876 // characters have width -1 (DOH!) on GNU/Linux sometimes.
877 int width = c < 0x100 ? 1 : wcwidth (c);
878
879 if (charsets[screen.charset] == '0') // DEC SPECIAL
880 {
881 // vt100 special graphics and line drawing
882 static uint16_t vt100_0[32] = { // 5f .. 7e
883 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
884 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
885 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
886 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
887 };
888
889 if (c >= 0x5f && c <= 0x7e)
840 { 890 {
841 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 891 c = vt100_0[c - 0x5f];
842 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 892 width = 1;
843 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break;
844 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
845 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break;
846 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break;
847 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
848 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
849 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
850 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
851 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
852 } 893 }
894 }
853 895
854 rend_t rend = SET_FONT (h->rstyle, R->TermWin.fontset->find_font (c)); 896 if (width != 0)
855
856 stp[R->screen.cur.col] = c;
857 srp[R->screen.cur.col] = rend;
858
859 if (c > 255)
860 { 897 {
861 // rely on wcwidth to tell us the character width, at least for non iso-8859-1 898#if !UNICODE_3 && ENABLE_COMBINING
862 int width = wcwidth (c); 899 // trim characters we can't store directly :(
900 if (c >= 0x10000)
901 c = rxvt_composite.compose (c); // map to lower 16 bits
902#endif
903 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
904 rend_t rend = SET_FONT (rstyle,
905 c > 0x7f || bold || c < 0x20
906 ? TermWin.fontset->find_font (c, bold)
907 : TermWin.ascii_map [c - 0x20]);
908
909 do
863 910 {
864 if (width > 1) 911 stp[screen.cur.col] = c;
912 srp[screen.cur.col] = rend;
913
914 if (screen.cur.col < last_col - 1)
915 screen.cur.col++;
865 { 916 else
866 while (--width > 0 && R->screen.cur.col < last_col - 1)
867 { 917 {
868 918 screen.tlen[row] = last_col;
869 srp[R->screen.cur.col] |= RS_wide; 919 if (screen.flags & Screen_Autowrap)
870 920 screen.flags |= Screen_WrapNext;
871 R->screen.cur.col++; 921 break;
872 stp[R->screen.cur.col] = NOCHAR;
873 srp[R->screen.cur.col] = rend;
874 } 922 }
923
924 c = NOCHAR;
875 } 925 }
926 while (--width > 0);
927
928 // pad with spaces when overwriting wide character with smaller one
929 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
930 {
931 stp[c] = ' ';
932 srp[c] = rend;
876 } 933 }
934 }
935 else if (width == 0)
936 {
937#if ENABLE_COMBINING
938 // handle combining characters
939 // we just tag the accent on the previous on-screen character.
940 // this is arguably not correct, but also arguably not wrong.
941 // we don't handle double-width characters nicely yet.
877 942
878 if (R->screen.cur.col < last_col - 1) 943 text_t *tp;
879 R->screen.cur.col++; 944 rend_t *rp;
880 else { 945
881 R->screen.tlen[row] = last_col; 946 if (screen.cur.col > 0)
882 if (R->screen.flags & Screen_Autowrap) 947 {
883 R->screen.flags |= Screen_WrapNext; 948 tp = stp + screen.cur.col - 1;
884 } 949 rp = srp + screen.cur.col - 1;
950 }
951 else if (screen.cur.row > 0
952 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
953 {
954 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
955 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
956 }
957 else
958 continue;
959
960 // handle double-width-chars by making them look extremely ugly
961 if (*tp == NOCHAR)
962 *tp = ' '; // hack //D //TODO //--tp, --rp;
963
964 // first try to find a precomposed character
965 unicode_t n = rxvt_compose (*tp, c);
966 if (n == NOCHAR)
967 n = rxvt_composite.compose (*tp, c);
968
969 *tp = n;
970 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
971#endif
972 }
885 } 973 }
974
886 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 975 if (screen.tlen[row] != -1) /* XXX: think about this */
887 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 976 MAX_IT (screen.tlen[row], screen.cur.col);
888 977
889/* 978 /*
890 * If we wrote anywhere in the selected area, kill the selection 979 * If we wrote anywhere in the selected area, kill the selection
891 * XXX: should we kill the mark too? Possibly, but maybe that 980 * XXX: should we kill the mark too? Possibly, but maybe that
892 * should be a similar check. 981 * should be a similar check.
893 */ 982 */
894 if (clearsel) 983 if (clearsel)
895 CLEAR_SELECTION(R); 984 CLEAR_SELECTION ();
896 985
897#ifdef DEBUG_STRICT 986#ifdef DEBUG_STRICT
898 assert(R->screen.cur.row >= 0); 987 assert (screen.cur.row >= 0);
899#else /* drive with your eyes closed */ 988#else /* drive with your eyes closed */
900 MAX_IT(R->screen.cur.row, 0); 989 MAX_IT (screen.cur.row, 0);
901#endif 990#endif
902} 991}
903 992
904/* ------------------------------------------------------------------------- */ 993/* ------------------------------------------------------------------------- */
905/* 994/*
906 * Process Backspace. Move back the cursor back a position, wrap if have to 995 * Process Backspace. Move back the cursor back a position, wrap if have to
907 * XTERM_SEQ: CTRL-H 996 * XTERM_SEQ: CTRL-H
908 */ 997 */
909/* EXTPROTO */
910void 998void
911rxvt_scr_backspace(pR) 999rxvt_term::scr_backspace ()
912{ 1000{
913 RESET_CHSTAT(R->h);
914 R->h->want_refresh = 1; 1001 want_refresh = 1;
1002
915 if (R->screen.cur.col == 0) { 1003 if (screen.cur.col == 0)
1004 {
916 if (R->screen.cur.row > 0) { 1005 if (screen.cur.row > 0)
1006 {
917#ifdef TERMCAP_HAS_BW 1007#ifdef TERMCAP_HAS_BW
918 R->screen.cur.col = R->TermWin.ncol - 1; 1008 screen.cur.col = TermWin.ncol - 1;
919 R->screen.cur.row--; 1009 screen.cur.row--;
920 return; 1010 return;
921#endif 1011#endif
922 } 1012
1013 }
1014 }
923 } else if ((R->screen.flags & Screen_WrapNext) == 0) 1015 else if ((screen.flags & Screen_WrapNext) == 0)
924 rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); 1016 scr_gotorc (0, -1, RELATIVE);
1017
925 R->screen.flags &= ~Screen_WrapNext; 1018 screen.flags &= ~Screen_WrapNext;
926} 1019}
927 1020
928/* ------------------------------------------------------------------------- */ 1021/* ------------------------------------------------------------------------- */
929/* 1022/*
930 * Process Horizontal Tab 1023 * Process Horizontal Tab
931 * count: +ve = forward; -ve = backwards 1024 * count: +ve = forward; -ve = backwards
932 * XTERM_SEQ: CTRL-I 1025 * XTERM_SEQ: CTRL-I
933 */ 1026 */
934/* EXTPROTO */
935void 1027void
936rxvt_scr_tab(pR_ int count) 1028rxvt_term::scr_tab (int count)
937{ 1029{
938 int i, x; 1030 int i, x;
939 1031
940 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); 1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
941 R->h->want_refresh = 1; 1033 want_refresh = 1;
942 RESET_CHSTAT(R->h);
943 i = x = R->screen.cur.col; 1034 i = x = screen.cur.col;
1035
944 if (count == 0) 1036 if (count == 0)
945 return; 1037 return;
946 else if (count > 0) { 1038 else if (count > 0)
1039 {
947 for (; ++i < R->TermWin.ncol; ) 1040 for (; ++i < TermWin.ncol; )
948 if (R->tabs[i]) { 1041 if (tabs[i])
949 x = i; 1042 {
950 if (!--count) 1043 x = i;
951 break; 1044 if (!--count)
1045 break;
1046 }
1047
1048 if (count)
1049 x = TermWin.ncol - 1;
952 } 1050 }
953 if (count)
954 x = R->TermWin.ncol - 1;
955 } else /* if (count < 0) */ { 1051 else /* if (count < 0) */
1052 {
956 for (; --i >= 0; ) 1053 for (; --i >= 0; )
957 if (R->tabs[i]) { 1054 if (tabs[i])
958 x = i; 1055 {
959 if (!++count) 1056 x = i;
960 break; 1057 if (!++count)
1058 break;
1059 }
1060
1061 if (count)
1062 x = 0;
961 } 1063 }
962 if (count) 1064
963 x = 0;
964 }
965 if (x != R->screen.cur.col) 1065 if (x != screen.cur.col)
966 rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); 1066 scr_gotorc (0, x, R_RELATIVE);
967} 1067}
968 1068
969/* ------------------------------------------------------------------------- */ 1069/* ------------------------------------------------------------------------- */
970/* 1070/*
971 * Process DEC Back Index 1071 * Process DEC Back Index
972 * XTERM_SEQ: ESC 6 1072 * XTERM_SEQ: ESC 6
973 * Move cursor left in row. If we're at the left boundary, shift everything 1073 * Move cursor left in row. If we're at the left boundary, shift everything
974 * in that row right. Clear left column. 1074 * in that row right. Clear left column.
975 */ 1075 */
976#ifndef NO_FRILLS 1076#ifndef NO_FRILLS
977/* EXTPROTO */
978void 1077void
979rxvt_scr_backindex(pR) 1078rxvt_term::scr_backindex ()
980{ 1079{
981 if (R->screen.cur.col > 0) 1080 if (screen.cur.col > 0)
982 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 1081 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
983 else { 1082 else
1083 {
984 if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) 1084 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
985 return; /* um, yeah? */ 1085 return; /* um, yeah? */
986 rxvt_scr_insdel_chars(aR_ 1, INSERT); 1086 scr_insdel_chars (1, INSERT);
987 } 1087 }
988} 1088}
989#endif 1089#endif
990/* ------------------------------------------------------------------------- */ 1090/* ------------------------------------------------------------------------- */
991/* 1091/*
… …
993 * XTERM_SEQ: ESC 9 1093 * XTERM_SEQ: ESC 9
994 * Move cursor right in row. If we're at the right boundary, shift everything 1094 * Move cursor right in row. If we're at the right boundary, shift everything
995 * in that row left. Clear right column. 1095 * in that row left. Clear right column.
996 */ 1096 */
997#ifndef NO_FRILLS 1097#ifndef NO_FRILLS
998/* EXTPROTO */
999void 1098void
1000rxvt_scr_forwardindex(pR) 1099rxvt_term::scr_forwardindex ()
1001{ 1100{
1002 int row; 1101 int row;
1003 1102
1004 if (R->screen.cur.col < R->TermWin.ncol - 1) 1103 if (screen.cur.col < TermWin.ncol - 1)
1005 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 1104 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1006 else { 1105 else
1106 {
1007 row = R->screen.cur.row + R->TermWin.saveLines; 1107 row = screen.cur.row + TermWin.saveLines;
1008 if (R->screen.tlen[row] == 0) 1108 if (screen.tlen[row] == 0)
1009 return; /* um, yeah? */ 1109 return; /* um, yeah? */
1010 else if (R->screen.tlen[row] == -1) 1110 else if (screen.tlen[row] == -1)
1011 R->screen.tlen[row] = R->TermWin.ncol; 1111 screen.tlen[row] = TermWin.ncol;
1012 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 1112 scr_gotorc (0, 0, R_RELATIVE);
1013 rxvt_scr_insdel_chars(aR_ 1, DELETE); 1113 scr_insdel_chars (1, DELETE);
1014 rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); 1114 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1015 } 1115 }
1016} 1116}
1017#endif 1117#endif
1018 1118
1019/* ------------------------------------------------------------------------- */ 1119/* ------------------------------------------------------------------------- */
1020/* 1120/*
1021 * Goto Row/Column 1121 * Goto Row/Column
1022 */ 1122 */
1023/* EXTPROTO */
1024void 1123void
1025rxvt_scr_gotorc(pR_ int row, int col, int relative) 1124rxvt_term::scr_gotorc (int row, int col, int relative)
1026{ 1125{
1027 R->h->want_refresh = 1; 1126 want_refresh = 1;
1028 ZERO_SCROLLBACK(R); 1127 ZERO_SCROLLBACK ();
1029 RESET_CHSTAT(R->h);
1030#ifdef RXVT_GRAPHICS
1031 if (rxvt_Gr_Displayed(aR))
1032 rxvt_Gr_scroll(aR_ 0);
1033#endif
1034 1128
1035 D_SCREEN((stderr, "rxvt_scr_gotorc(r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, R->screen.cur.row, R->screen.cur.col)); 1129 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1036 1130
1037 R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) 1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1038 : col);
1039 MAX_IT(R->screen.cur.col, 0); 1132 MAX_IT (screen.cur.col, 0);
1040 MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1); 1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1041 1134
1042 R->screen.flags &= ~Screen_WrapNext; 1135 screen.flags &= ~Screen_WrapNext;
1043 if (relative & R_RELATIVE) { 1136 if (relative & R_RELATIVE)
1044 if (row > 0) { 1137 {
1138 if (row > 0)
1139 {
1045 if (R->screen.cur.row <= R->screen.bscroll 1140 if (screen.cur.row <= screen.bscroll
1046 && (R->screen.cur.row + row) > R->screen.bscroll) 1141 && (screen.cur.row + row) > screen.bscroll)
1047 R->screen.cur.row = R->screen.bscroll; 1142 screen.cur.row = screen.bscroll;
1048 else 1143 else
1049 R->screen.cur.row += row; 1144 screen.cur.row += row;
1145 }
1050 } else if (row < 0) { 1146 else if (row < 0)
1147 {
1051 if (R->screen.cur.row >= R->screen.tscroll 1148 if (screen.cur.row >= screen.tscroll
1052 && (R->screen.cur.row + row) < R->screen.tscroll) 1149 && (screen.cur.row + row) < screen.tscroll)
1053 R->screen.cur.row = R->screen.tscroll; 1150 screen.cur.row = screen.tscroll;
1151 else
1152 screen.cur.row += row;
1153 }
1154 }
1054 else 1155 else
1055 R->screen.cur.row += row; 1156 {
1056 } 1157 if (screen.flags & Screen_Relative)
1057 } else { 1158 { /* relative origin mode */
1058 if (R->screen.flags & Screen_Relative) { /* relative origin mode */
1059 R->screen.cur.row = row + R->screen.tscroll; 1159 screen.cur.row = row + screen.tscroll;
1060 MIN_IT(R->screen.cur.row, R->screen.bscroll); 1160 MIN_IT (screen.cur.row, screen.bscroll);
1061 } else 1161 }
1062 R->screen.cur.row = row; 1162 else
1163 screen.cur.row = row;
1063 } 1164 }
1064 MAX_IT(R->screen.cur.row, 0); 1165 MAX_IT (screen.cur.row, 0);
1065 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1166 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1167
1168 while (screen.cur.col > 0
1169 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1170 screen.cur.col--;
1066} 1171}
1067 1172
1068/* ------------------------------------------------------------------------- */ 1173/* ------------------------------------------------------------------------- */
1069/* 1174/*
1070 * direction should be UP or DN 1175 * direction should be UP or DN
1071 */ 1176 */
1072/* EXTPROTO */
1073void 1177void
1074rxvt_scr_index(pR_ enum page_dirn direction) 1178rxvt_term::scr_index (enum page_dirn direction)
1075{ 1179{
1076 int dirn; 1180 int dirn;
1077 1181
1078 R->h->want_refresh = 1; 1182 want_refresh = 1;
1079 dirn = ((direction == UP) ? 1 : -1); 1183 dirn = ((direction == UP) ? 1 : -1);
1080 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); 1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1081 1185
1082 ZERO_SCROLLBACK(R); 1186 ZERO_SCROLLBACK ();
1083 RESET_CHSTAT(R->h);
1084 1187
1085#ifdef RXVT_GRAPHICS
1086 if (rxvt_Gr_Displayed(aR))
1087 rxvt_Gr_scroll(aR_ 0);
1088#endif
1089
1090 R->screen.flags &= ~Screen_WrapNext; 1188 screen.flags &= ~Screen_WrapNext;
1091 if ((R->screen.cur.row == R->screen.bscroll && direction == UP) 1189 if ((screen.cur.row == screen.bscroll && direction == UP)
1092 || (R->screen.cur.row == R->screen.tscroll && direction == DN)) 1190 || (screen.cur.row == screen.tscroll && direction == DN))
1093 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); 1191 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1094 else 1192 else
1095 R->screen.cur.row += dirn; 1193 screen.cur.row += dirn;
1096 MAX_IT(R->screen.cur.row, 0); 1194 MAX_IT (screen.cur.row, 0);
1097 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1195 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1098 rxvt_selection_check(aR_ 0); 1196 selection_check (0);
1099} 1197}
1100 1198
1101/* ------------------------------------------------------------------------- */ 1199/* ------------------------------------------------------------------------- */
1102/* 1200/*
1103 * Erase part or whole of a line 1201 * Erase part or whole of a line
1104 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1202 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1105 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1203 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1106 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1204 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1107 */ 1205 */
1108/* EXTPROTO */
1109void 1206void
1110rxvt_scr_erase_line(pR_ int mode) 1207rxvt_term::scr_erase_line (int mode)
1111{ 1208{
1112 unsigned int row, col, num; 1209 unsigned int row, col, num;
1113 1210
1114 R->h->want_refresh = 1; 1211 want_refresh = 1;
1115 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row)); 1212 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1116 ZERO_SCROLLBACK(R); 1213 ZERO_SCROLLBACK ();
1117 RESET_CHSTAT(R->h);
1118 1214
1119#ifdef RXVT_GRAPHICS
1120 if (rxvt_Gr_Displayed(aR))
1121 rxvt_Gr_scroll(aR_ 0);
1122#endif
1123
1124 rxvt_selection_check(aR_ 1); 1215 selection_check (1);
1125 1216
1126 R->screen.flags &= ~Screen_WrapNext; 1217 screen.flags &= ~Screen_WrapNext;
1127 1218
1128 row = R->TermWin.saveLines + R->screen.cur.row; 1219 row = TermWin.saveLines + screen.cur.row;
1129 switch (mode) { 1220 switch (mode)
1130 case 0: /* erase to end of line */ 1221 {
1222 case 0: /* erase to end of line */
1131 col = R->screen.cur.col; 1223 col = screen.cur.col;
1132 num = R->TermWin.ncol - col; 1224 num = TermWin.ncol - col;
1133 MIN_IT(R->screen.tlen[row], (int16_t)col); 1225 MIN_IT (screen.tlen[row], (int16_t)col);
1134 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) 1226 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1135 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) 1227 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1136 CLEAR_SELECTION(R); 1228 CLEAR_SELECTION ();
1137 break; 1229 break;
1138 case 1: /* erase to beginning of line */ 1230 case 1: /* erase to beginning of line */
1139 col = 0; 1231 col = 0;
1140 num = R->screen.cur.col + 1; 1232 num = screen.cur.col + 1;
1141 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) 1233 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1142 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) 1234 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1143 CLEAR_SELECTION(R); 1235 CLEAR_SELECTION ();
1144 break; 1236 break;
1145 case 2: /* erase whole line */ 1237 case 2: /* erase whole line */
1146 col = 0; 1238 col = 0;
1147 num = R->TermWin.ncol; 1239 num = TermWin.ncol;
1148 R->screen.tlen[row] = 0; 1240 screen.tlen[row] = 0;
1149 if (R->selection.beg.row <= R->screen.cur.row 1241 if (selection.beg.row <= screen.cur.row
1150 && R->selection.end.row >= R->screen.cur.row) 1242 && selection.end.row >= screen.cur.row)
1151 CLEAR_SELECTION(R); 1243 CLEAR_SELECTION ();
1152 break; 1244 break;
1153 default: 1245 default:
1154 return; 1246 return;
1155 } 1247 }
1248
1156 if (R->screen.text[row]) 1249 if (screen.text[row])
1157 rxvt_blank_line(aR_ 1250 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1158 &(R->screen.text[row][col]),
1159 &(R->screen.rend[row][col]), num, R->h->rstyle);
1160 else 1251 else
1161 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row, 1252 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1162 R->h->rstyle);
1163} 1253}
1164 1254
1165/* ------------------------------------------------------------------------- */ 1255/* ------------------------------------------------------------------------- */
1166/* 1256/*
1167 * Erase part of whole of the screen 1257 * Erase part of whole of the screen
1168 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1258 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1169 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1259 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1170 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1260 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1171 */ 1261 */
1172/* EXTPROTO */
1173void 1262void
1174rxvt_scr_erase_screen(pR_ int mode) 1263rxvt_term::scr_erase_screen (int mode)
1175{ 1264{
1176 int num; 1265 int num;
1177 int32_t row, row_offset; 1266 int32_t row, row_offset;
1178 rend_t ren; 1267 rend_t ren;
1179 XGCValues gcvalue; 1268 XGCValues gcvalue;
1180 1269
1181 R->h->want_refresh = 1; 1270 want_refresh = 1;
1182 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, R->screen.cur.row)); 1271 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1183 ZERO_SCROLLBACK(R); 1272 ZERO_SCROLLBACK ();
1184 RESET_CHSTAT(R->h);
1185 row_offset = (int32_t)R->TermWin.saveLines; 1273 row_offset = (int32_t)TermWin.saveLines;
1186 1274
1187 switch (mode) { 1275 switch (mode)
1276 {
1188 case 0: /* erase to end of screen */ 1277 case 0: /* erase to end of screen */
1189 rxvt_selection_check(aR_ 1); 1278 selection_check (1);
1190 rxvt_scr_erase_line(aR_ 0); 1279 scr_erase_line (0);
1191 row = R->screen.cur.row + 1; /* possible OOB */ 1280 row = screen.cur.row + 1; /* possible OOB */
1192 num = R->TermWin.nrow - row; 1281 num = TermWin.nrow - row;
1193 break; 1282 break;
1194 case 1: /* erase to beginning of screen */ 1283 case 1: /* erase to beginning of screen */
1195 rxvt_selection_check(aR_ 3); 1284 selection_check (3);
1196 rxvt_scr_erase_line(aR_ 1); 1285 scr_erase_line (1);
1197 row = 0; 1286 row = 0;
1198 num = R->screen.cur.row; 1287 num = screen.cur.row;
1199 break; 1288 break;
1200 case 2: /* erase whole screen */ 1289 case 2: /* erase whole screen */
1201 rxvt_selection_check(aR_ 3); 1290 selection_check (3);
1202#ifdef RXVT_GRAPHICS 1291 row = 0;
1203 rxvt_Gr_ClearScreen(aR);
1204#endif
1205 row = 0;
1206 num = R->TermWin.nrow; 1292 num = TermWin.nrow;
1207 break; 1293 break;
1208 default: 1294 default:
1209 return; 1295 return;
1210 } 1296 }
1211 R->h->refresh_type |= REFRESH_BOUNDS; 1297
1212 if (R->selection.op && R->h->current_screen == R->selection.screen 1298 if (selection.op && current_screen == selection.screen
1213 && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) 1299 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1214 || (R->selection.end.row >= row 1300 || (selection.end.row >= row
1215 && R->selection.end.row <= row + num))) 1301 && selection.end.row <= row + num)))
1216 CLEAR_SELECTION(R); 1302 CLEAR_SELECTION ();
1303
1217 if (row >= R->TermWin.nrow) /* Out Of Bounds */ 1304 if (row >= TermWin.nrow) /* Out Of Bounds */
1218 return; 1305 return;
1306
1219 MIN_IT(num, (R->TermWin.nrow - row)); 1307 MIN_IT (num, (TermWin.nrow - row));
1308
1220 if (R->h->rstyle & (RS_RVid | RS_Uline)) 1309 if (rstyle & (RS_RVid | RS_Uline))
1221 ren = (rend_t) ~RS_None; 1310 ren = (rend_t) ~RS_None;
1222 else if (GET_BASEBG(R->h->rstyle) == Color_bg) { 1311 else if (GET_BASEBG (rstyle) == Color_bg)
1312 {
1223 ren = DEFAULT_RSTYLE; 1313 ren = DEFAULT_RSTYLE;
1224 CLEAR_ROWS(row, num); 1314 CLEAR_ROWS (row, num);
1225 } else { 1315 }
1316 else
1317 {
1226 ren = (R->h->rstyle & (RS_fgMask | RS_bgMask)); 1318 ren = (rstyle & (RS_fgMask | RS_bgMask));
1227 gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->h->rstyle)]; 1319 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)];
1228 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1229 ERASE_ROWS(row, num); 1321 ERASE_ROWS (row, num);
1230 gcvalue.foreground = R->PixColors[Color_fg]; 1322 gcvalue.foreground = PixColors[Color_fg];
1231 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1232 } 1324 }
1325
1233 for (; num--; row++) { 1326 for (; num--; row++)
1327 {
1234 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 1328 scr_blank_screen_mem (screen.text, screen.rend,
1235 (unsigned int)(row + row_offset), R->h->rstyle); 1329 (unsigned int) (row + row_offset), rstyle);
1236 R->screen.tlen[row + row_offset] = 0; 1330 screen.tlen[row + row_offset] = 0;
1237 rxvt_blank_line(aR_ 1331 scr_blank_line (drawn_text[row], drawn_rend[row],
1238 R->drawn_text[row], R->drawn_rend[row], 1332 (unsigned int)TermWin.ncol, ren);
1239 (unsigned int)R->TermWin.ncol, ren);
1240 } 1333 }
1241} 1334}
1242 1335
1243/* ------------------------------------------------------------------------- */ 1336/* ------------------------------------------------------------------------- */
1244/* 1337/*
1245 * Fill the screen with `E's 1338 * Fill the screen with `E's
1246 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1339 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1247 */ 1340 */
1248/* EXTPROTO */
1249void 1341void
1250rxvt_scr_E(pR) 1342rxvt_term::scr_E ()
1251{ 1343{
1252 int i, j, k; 1344 int i, j, k;
1253 rend_t *r1, fs; 1345 rend_t *r1, fs;
1254 1346
1255 R->h->want_refresh = 1; 1347 want_refresh = 1;
1256 R->h->num_scr_allow = 0; 1348 num_scr_allow = 0;
1257 ZERO_SCROLLBACK(R); 1349 ZERO_SCROLLBACK ();
1258 RESET_CHSTAT(R->h);
1259 rxvt_selection_check(aR_ 3); 1350 selection_check (3);
1260 1351
1261 fs = SET_FONT (R->h->rstyle, R->TermWin.fontset->find_font ('E')); 1352 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1262 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1353 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1354 {
1263 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1355 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1264 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1356 fill_text (screen.text[k], 'E', TermWin.ncol);
1265 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1357 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1266 *r1++ = fs; 1358 *r1++ = fs;
1267 } 1359 }
1268} 1360}
1269 1361
1270/* ------------------------------------------------------------------------- */ 1362/* ------------------------------------------------------------------------- */
1271/* 1363/*
1272 * Insert/Delete <count> lines 1364 * Insert/Delete <count> lines
1273 */ 1365 */
1274/* EXTPROTO */
1275void 1366void
1276rxvt_scr_insdel_lines(pR_ int count, int insdel) 1367rxvt_term::scr_insdel_lines (int count, int insdel)
1277{ 1368{
1278 int end; 1369 int end;
1279 1370
1280 ZERO_SCROLLBACK(R); 1371 ZERO_SCROLLBACK ();
1281 RESET_CHSTAT(R->h);
1282 1372
1283#ifdef RXVT_GRAPHICS
1284 if (rxvt_Gr_Displayed(aR))
1285 rxvt_Gr_scroll(aR_ 0);
1286#endif
1287
1288 rxvt_selection_check(aR_ 1); 1373 selection_check (1);
1289 1374
1290 if (R->screen.cur.row > R->screen.bscroll) 1375 if (screen.cur.row > screen.bscroll)
1291 return;
1292
1293 end = R->screen.bscroll - R->screen.cur.row + 1;
1294 if (count > end) {
1295 if (insdel == DELETE)
1296 return; 1376 return;
1377
1378 end = screen.bscroll - screen.cur.row + 1;
1379 if (count > end)
1380 {
1381 if (insdel == DELETE)
1382 return;
1297 else if (insdel == INSERT) 1383 else if (insdel == INSERT)
1298 count = end; 1384 count = end;
1299 } 1385 }
1300 R->screen.flags &= ~Screen_WrapNext; 1386 screen.flags &= ~Screen_WrapNext;
1301 1387
1302 rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, 1388 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1303 0);
1304} 1389}
1305 1390
1306/* ------------------------------------------------------------------------- */ 1391/* ------------------------------------------------------------------------- */
1307/* 1392/*
1308 * Insert/Delete <count> characters from the current position 1393 * Insert/Delete <count> characters from the current position
1309 */ 1394 */
1310/* EXTPROTO */
1311void 1395void
1312rxvt_scr_insdel_chars(pR_ int count, int insdel) 1396rxvt_term::scr_insdel_chars (int count, int insdel)
1313{ 1397{
1314 int col, row; 1398 int col, row;
1315 rend_t tr; 1399 rend_t tr;
1316 text_t *stp; 1400 text_t *stp;
1317 rend_t *srp; 1401 rend_t *srp;
1318 int16_t *slp; 1402 int16_t *slp;
1319 1403
1320 R->h->want_refresh = 1; 1404 want_refresh = 1;
1321 ZERO_SCROLLBACK(R); 1405 ZERO_SCROLLBACK ();
1322#if 0
1323 RESET_CHSTAT(R->h);
1324#endif
1325 1406
1326#ifdef RXVT_GRAPHICS
1327 if (rxvt_Gr_Displayed(aR))
1328 rxvt_Gr_scroll(aR_ 0);
1329#endif
1330
1331 if (count <= 0) 1407 if (count <= 0)
1332 return; 1408 return;
1333 1409
1334 rxvt_selection_check(aR_ 1); 1410 selection_check (1);
1335 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1411 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1336 1412
1337 row = R->screen.cur.row + R->TermWin.saveLines; 1413 row = screen.cur.row + TermWin.saveLines;
1338 R->screen.flags &= ~Screen_WrapNext; 1414 screen.flags &= ~Screen_WrapNext;
1339 1415
1340 stp = R->screen.text[row]; 1416 stp = screen.text[row];
1341 srp = R->screen.rend[row]; 1417 srp = screen.rend[row];
1342 slp = &(R->screen.tlen[row]); 1418 slp = & (screen.tlen[row]);
1419
1343 switch (insdel) { 1420 switch (insdel)
1421 {
1344 case INSERT: 1422 case INSERT:
1345 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1346 col--) { 1424 col--)
1425 {
1347 stp[col] = stp[col - count]; 1426 stp[col] = stp[col - count];
1348 srp[col] = srp[col - count]; 1427 srp[col] = srp[col - count];
1349 } 1428 }
1350 if (*slp != -1) { 1429
1430 if (*slp != -1)
1431 {
1351 *slp += count; 1432 *slp += count;
1352 MIN_IT(*slp, R->TermWin.ncol); 1433 MIN_IT (*slp, TermWin.ncol);
1353 } 1434 }
1435
1354 if (R->selection.op && R->h->current_screen == R->selection.screen 1436 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1437 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1438 {
1356 if (R->selection.end.row != R->screen.cur.row 1439 if (selection.end.row != screen.cur.row
1357 || (R->selection.end.col + count >= R->TermWin.ncol)) 1440 || (selection.end.col + count >= TermWin.ncol))
1358 CLEAR_SELECTION(R); 1441 CLEAR_SELECTION ();
1359 else { /* shift selection */ 1442 else
1360 R->selection.beg.col += count; 1443 { /* shift selection */
1444 selection.beg.col += count;
1361 R->selection.mark.col += count; /* XXX: yes? */ 1445 selection.mark.col += count; /* XXX: yes? */
1362 R->selection.end.col += count; 1446 selection.end.col += count;
1363 } 1447 }
1364 } 1448 }
1449
1365 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1366 (unsigned int)count, R->h->rstyle); 1451 (unsigned int)count, rstyle);
1367 break; 1452 break;
1453
1368 case ERASE: 1454 case ERASE:
1369 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1455 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1370 rxvt_selection_check(aR_ 1); 1456 selection_check (1);
1371 R->screen.cur.col -= count; 1457 screen.cur.col -= count;
1372 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1458 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1373 (unsigned int)count, R->h->rstyle); 1459 (unsigned int)count, rstyle);
1374 break; 1460 break;
1461
1375 case DELETE: 1462 case DELETE:
1376 tr = srp[R->TermWin.ncol - 1] 1463 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1377 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1464
1378 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1465 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1466 {
1379 stp[col] = stp[col + count]; 1467 stp[col] = stp[col + count];
1380 srp[col] = srp[col + count]; 1468 srp[col] = srp[col + count];
1381 } 1469 }
1382 rxvt_blank_line(aR_ 1470
1471 scr_blank_line (& (stp[TermWin.ncol - count]),
1383 &(stp[R->TermWin.ncol - count]), 1472 & (srp[TermWin.ncol - count]),
1384 &(srp[R->TermWin.ncol - count]), 1473 (unsigned int)count, tr);
1385 (unsigned int)count, tr); 1474
1386 if (*slp == -1) /* break line continuation */ 1475 if (*slp == -1) /* break line continuation */
1387 *slp = R->TermWin.ncol; 1476 *slp = TermWin.ncol;
1477
1388 *slp -= count; 1478 *slp -= count;
1389 MAX_IT(*slp, 0); 1479 MAX_IT (*slp, 0);
1480
1390 if (R->selection.op && R->h->current_screen == R->selection.screen 1481 if (selection.op && current_screen == selection.screen
1391 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1482 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1483 {
1392 if (R->selection.end.row != R->screen.cur.row 1484 if (selection.end.row != screen.cur.row
1393 || (R->screen.cur.col >= R->selection.beg.col - count) 1485 || (screen.cur.col >= selection.beg.col - count)
1394 || R->selection.end.col >= R->TermWin.ncol) 1486 || selection.end.col >= TermWin.ncol)
1395 CLEAR_SELECTION(R); 1487 CLEAR_SELECTION ();
1396 else { 1488 else
1397 /* shift selection */ 1489 {
1398 R->selection.beg.col -= count; 1490 /* shift selection */
1491 selection.beg.col -= count;
1399 R->selection.mark.col -= count; /* XXX: yes? */ 1492 selection.mark.col -= count; /* XXX: yes? */
1400 R->selection.end.col -= count; 1493 selection.end.col -= count;
1401 } 1494 }
1402 } 1495 }
1403 break; 1496
1497 break;
1404 } 1498 }
1405} 1499}
1406 1500
1407/* ------------------------------------------------------------------------- */ 1501/* ------------------------------------------------------------------------- */
1408/* 1502/*
1409 * Set the scrolling region 1503 * Set the scrolling region
1410 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1504 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1411 */ 1505 */
1412/* EXTPROTO */
1413void 1506void
1414rxvt_scr_scroll_region(pR_ int top, int bot) 1507rxvt_term::scr_scroll_region (int top, int bot)
1415{ 1508{
1416 MAX_IT(top, 0); 1509 MAX_IT (top, 0);
1417 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1510 MIN_IT (bot, (int)TermWin.nrow - 1);
1511
1418 if (top > bot) 1512 if (top > bot)
1419 return; 1513 return;
1514
1420 R->screen.tscroll = top; 1515 screen.tscroll = top;
1421 R->screen.bscroll = bot; 1516 screen.bscroll = bot;
1422 rxvt_scr_gotorc(aR_ 0, 0, 0); 1517 scr_gotorc (0, 0, 0);
1423} 1518}
1424 1519
1425/* ------------------------------------------------------------------------- */ 1520/* ------------------------------------------------------------------------- */
1426/* 1521/*
1427 * Make the cursor visible/invisible 1522 * Make the cursor visible/invisible
1428 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1523 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1429 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1524 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1430 */ 1525 */
1431/* EXTPROTO */
1432void 1526void
1433rxvt_scr_cursor_visible(pR_ int mode) 1527rxvt_term::scr_cursor_visible (int mode)
1434{ 1528{
1435 R->h->want_refresh = 1; 1529 want_refresh = 1;
1530
1436 if (mode) 1531 if (mode)
1437 R->screen.flags |= Screen_VisibleCursor; 1532 screen.flags |= Screen_VisibleCursor;
1438 else 1533 else
1439 R->screen.flags &= ~Screen_VisibleCursor; 1534 screen.flags &= ~Screen_VisibleCursor;
1440} 1535}
1441 1536
1442/* ------------------------------------------------------------------------- */ 1537/* ------------------------------------------------------------------------- */
1443/* 1538/*
1444 * Set/unset automatic wrapping 1539 * Set/unset automatic wrapping
1445 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1540 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1446 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1541 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1447 */ 1542 */
1448/* EXTPROTO */
1449void 1543void
1450rxvt_scr_autowrap(pR_ int mode) 1544rxvt_term::scr_autowrap (int mode)
1451{ 1545{
1452 if (mode) 1546 if (mode)
1453 R->screen.flags |= Screen_Autowrap; 1547 screen.flags |= Screen_Autowrap;
1454 else 1548 else
1455 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1549 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext);
1456} 1550}
1457 1551
1458/* ------------------------------------------------------------------------- */ 1552/* ------------------------------------------------------------------------- */
1459/* 1553/*
1460 * Set/unset margin origin mode 1554 * Set/unset margin origin mode
… …
1463 * Relative mode: line numbers are relative to top margin of scrolling region 1557 * Relative mode: line numbers are relative to top margin of scrolling region
1464 * and the cursor cannot be moved outside. 1558 * and the cursor cannot be moved outside.
1465 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1559 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1466 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1560 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1467 */ 1561 */
1468/* EXTPROTO */
1469void 1562void
1470rxvt_scr_relative_origin(pR_ int mode) 1563rxvt_term::scr_relative_origin (int mode)
1471{ 1564{
1472 if (mode) 1565 if (mode)
1473 R->screen.flags |= Screen_Relative; 1566 screen.flags |= Screen_Relative;
1474 else 1567 else
1475 R->screen.flags &= ~Screen_Relative; 1568 screen.flags &= ~Screen_Relative;
1476 rxvt_scr_gotorc(aR_ 0, 0, 0); 1569 scr_gotorc (0, 0, 0);
1477} 1570}
1478 1571
1479/* ------------------------------------------------------------------------- */ 1572/* ------------------------------------------------------------------------- */
1480/* 1573/*
1481 * Set insert/replace mode 1574 * Set insert/replace mode
1482 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1575 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1483 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1576 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1484 */ 1577 */
1485/* EXTPROTO */
1486void 1578void
1487rxvt_scr_insert_mode(pR_ int mode) 1579rxvt_term::scr_insert_mode (int mode)
1488{ 1580{
1489 if (mode) 1581 if (mode)
1490 R->screen.flags |= Screen_Insert; 1582 screen.flags |= Screen_Insert;
1491 else 1583 else
1492 R->screen.flags &= ~Screen_Insert; 1584 screen.flags &= ~Screen_Insert;
1493} 1585}
1494 1586
1495/* ------------------------------------------------------------------------- */ 1587/* ------------------------------------------------------------------------- */
1496/* 1588/*
1497 * Set/Unset tabs 1589 * Set/Unset tabs
1498 * XTERM_SEQ: Set tab at current column : ESC H 1590 * XTERM_SEQ: Set tab at current column : ESC H
1499 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1591 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1500 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1592 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1501 */ 1593 */
1502/* EXTPROTO */
1503void 1594void
1504rxvt_scr_set_tab(pR_ int mode) 1595rxvt_term::scr_set_tab (int mode)
1505{ 1596{
1506 if (mode < 0) 1597 if (mode < 0)
1507 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1598 MEMSET (tabs, 0, TermWin.ncol * sizeof (char));
1508 else if (R->screen.cur.col < R->TermWin.ncol) 1599 else if (screen.cur.col < TermWin.ncol)
1509 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1600 tabs[screen.cur.col] = (mode ? 1 : 0);
1510} 1601}
1511 1602
1512/* ------------------------------------------------------------------------- */ 1603/* ------------------------------------------------------------------------- */
1513/* 1604/*
1514 * Set reverse/normal video 1605 * Set reverse/normal video
1515 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1606 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1516 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1607 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1517 */ 1608 */
1518/* EXTPROTO */
1519void 1609void
1520rxvt_scr_rvideo_mode(pR_ int mode) 1610rxvt_term::scr_rvideo_mode (int mode)
1521{ 1611{
1522 XGCValues gcvalue; 1612 XGCValues gcvalue;
1523 1613
1524 if (R->h->rvideo != mode) { 1614 if (rvideo != mode)
1525 R->h->rvideo = mode; 1615 {
1616 rvideo = mode;
1526 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1617 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1527#if defined(XPM_BACKGROUND) 1618#if defined(XPM_BACKGROUND)
1528 if (R->h->bgPixmap.pixmap == None) 1619 if (bgPixmap.pixmap == None)
1529#endif 1620#endif
1530#if defined(TRANSPARENT) 1621#if defined(TRANSPARENT)
1531 if (!(R->Options & Opt_transparent) || R->h->am_transparent == 0) 1622 if (! (Options & Opt_transparent) || am_transparent == 0)
1532#endif 1623#endif
1533 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1624 XSetWindowBackground (display->display, TermWin.vt,
1534 R->PixColors[Color_bg]); 1625 PixColors[Color_bg]);
1535 1626
1536 gcvalue.foreground = R->PixColors[Color_fg]; 1627 gcvalue.foreground = PixColors[Color_fg];
1537 gcvalue.background = R->PixColors[Color_bg]; 1628 gcvalue.background = PixColors[Color_bg];
1538 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1629 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1539 &gcvalue); 1630 &gcvalue);
1540 rxvt_scr_clear(aR); 1631 scr_clear ();
1541 rxvt_scr_touch(aR_ True); 1632 scr_touch (true);
1542 } 1633 }
1543} 1634}
1544 1635
1545/* ------------------------------------------------------------------------- */ 1636/* ------------------------------------------------------------------------- */
1546/* 1637/*
1547 * Report current cursor position 1638 * Report current cursor position
1548 * XTERM_SEQ: Report position: ESC [ 6 n 1639 * XTERM_SEQ: Report position: ESC [ 6 n
1549 */ 1640 */
1550/* EXTPROTO */
1551void 1641void
1552rxvt_scr_report_position(pR) 1642rxvt_term::scr_report_position ()
1553{ 1643{
1554 rxvt_tt_printf(aR_ "\033[%d;%dR", R->screen.cur.row + 1, 1644 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1555 R->screen.cur.col + 1);
1556} 1645}
1557 1646
1558/* ------------------------------------------------------------------------- * 1647/* ------------------------------------------------------------------------- *
1559 * FONTS * 1648 * FONTS *
1560 * ------------------------------------------------------------------------- */ 1649 * ------------------------------------------------------------------------- */
1561 1650
1562/* 1651/*
1563 * Set font style 1652 * Set font style
1564 */ 1653 */
1565/* INTPROTO */
1566void 1654void
1567rxvt_set_font_style(pR) 1655rxvt_term::set_font_style ()
1568{ 1656{
1569 switch (R->h->charsets[R->screen.charset]) { 1657 switch (charsets[screen.charset])
1658 {
1570 case '0': /* DEC Special Character & Line Drawing Set */ 1659 case '0': /* DEC Special Character & Line Drawing Set */
1571 break; 1660 break;
1572 case 'A': /* United Kingdom (UK) */ 1661 case 'A': /* United Kingdom (UK) */
1573 break; 1662 break;
1574 case 'B': /* United States (USASCII) */ 1663 case 'B': /* United States (USASCII) */
1575 break; 1664 break;
1576 case '<': /* Multinational character set */ 1665 case '<': /* Multinational character set */
1577 break; 1666 break;
1578 case '5': /* Finnish character set */ 1667 case '5': /* Finnish character set */
1579 break; 1668 break;
1580 case 'C': /* Finnish character set */ 1669 case 'C': /* Finnish character set */
1581 break; 1670 break;
1582 case 'K': /* German character set */ 1671 case 'K': /* German character set */
1583 break; 1672 break;
1584 } 1673 }
1585} 1674}
1586 1675
1587/* ------------------------------------------------------------------------- */ 1676/* ------------------------------------------------------------------------- */
1588/* 1677/*
… …
1590 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1679 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1591 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1680 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1592 * XTERM_SEQ: Invoke G2 character set: ESC N 1681 * XTERM_SEQ: Invoke G2 character set: ESC N
1593 * XTERM_SEQ: Invoke G3 character set: ESC O 1682 * XTERM_SEQ: Invoke G3 character set: ESC O
1594 */ 1683 */
1595/* EXTPROTO */
1596void 1684void
1597rxvt_scr_charset_choose(pR_ int set) 1685rxvt_term::scr_charset_choose (int set)
1598{ 1686 {
1599 R->screen.charset = set; 1687 screen.charset = set;
1600 rxvt_set_font_style(aR); 1688 set_font_style ();
1601} 1689 }
1602 1690
1603/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1604/* 1692/*
1605 * Set a font 1693 * Set a font
1606 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1694 * XTERM_SEQ: Set G0 character set: ESC ( <C>
1607 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1695 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1608 * XTERM_SEQ: Set G2 character set: ESC * <C> 1696 * XTERM_SEQ: Set G2 character set: ESC * <C>
1609 * XTERM_SEQ: Set G3 character set: ESC + <C> 1697 * XTERM_SEQ: Set G3 character set: ESC + <C>
1610 * See set_font_style for possible values for <C> 1698 * See set_font_style for possible values for <C>
1611 */ 1699 */
1612/* EXTPROTO */
1613void 1700void
1614rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1701rxvt_term::scr_charset_set (int set, unsigned int ch)
1615{ 1702 {
1616 R->h->charsets[set] = (unsigned char)ch; 1703 charsets[set] = (unsigned char)ch;
1617 rxvt_set_font_style(aR); 1704 set_font_style ();
1618} 1705 }
1619 1706
1620
1621/* ------------------------------------------------------------------------- *
1622 * GRAPHICS COLOURS *
1623 * ------------------------------------------------------------------------- */
1624
1625#ifdef RXVT_GRAPHICS
1626/* EXTPROTO */
1627int
1628rxvt_scr_get_fgcolor(pR)
1629{
1630 return GET_FGCOLOR(R->h->rstyle);
1631}
1632
1633/* ------------------------------------------------------------------------- */
1634/* EXTPROTO */
1635int
1636rxvt_scr_get_bgcolor(pR)
1637{
1638 return GET_BGCOLOR(R->h->rstyle);
1639}
1640#endif
1641 1707
1642/* ------------------------------------------------------------------------- * 1708/* ------------------------------------------------------------------------- *
1643 * MAJOR SCREEN MANIPULATION * 1709 * MAJOR SCREEN MANIPULATION *
1644 * ------------------------------------------------------------------------- */ 1710 * ------------------------------------------------------------------------- */
1645 1711
1646/* 1712/*
1713 * refresh matching text.
1714 */
1715bool
1716rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1717{
1718 bool found = false;
1719
1720 for (int i = 0; i < TermWin.nrow; i++)
1721 {
1722 int col = 0;
1723 rend_t *drp = drawn_rend [i];
1724
1725 for (; col < TermWin.ncol; col++, drp++)
1726 if ((*drp & mask) == value)
1727 {
1728 found = true;
1729 *drp = ~value;
1730 }
1731 }
1732
1733 return found;
1734}
1735
1736/*
1647 * Refresh an area 1737 * Refresh an area
1648 */ 1738 */
1649enum { 1739enum {
1650 PART_BEG = 0, 1740 PART_BEG = 0,
1651 PART_END, 1741 PART_END,
1652 RC_COUNT 1742 RC_COUNT
1653}; 1743};
1654 1744
1655/* EXTPROTO */
1656void 1745void
1657rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) 1746rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1658{ 1747{
1659 int i; 1748 int i;
1660 row_col_t rc[RC_COUNT]; 1749 row_col_t rc[RC_COUNT];
1661 1750
1662 if (R->drawn_text == NULL) /* sanity check */ 1751 if (drawn_text == NULL) /* sanity check */
1663 return; 1752 return;
1753
1754#ifndef NO_SLOW_LINK_SUPPORT
1755 if (refresh_type == FAST_REFRESH && !display->is_local)
1756 {
1757 y = 0;
1758 height = TermWin.height;
1759 }
1760#endif
1664 1761
1665#ifdef DEBUG_STRICT 1762#ifdef DEBUG_STRICT
1666 x = max(x, (int)R->TermWin.int_bwidth); 1763 x = max (x, 0);
1667 x = min(x, (int)R->TermWin.width); 1764 x = min (x, (int)TermWin.width);
1668 y = max(y, (int)R->TermWin.int_bwidth); 1765 y = max (y, 0);
1669 y = min(y, (int)R->TermWin.height); 1766 y = min (y, (int)TermWin.height);
1670#endif 1767#endif
1671 1768
1672/* round down */ 1769 /* round down */
1673 rc[PART_BEG].col = Pixel2Col(x); 1770 rc[PART_BEG].col = Pixel2Col (x);
1674 rc[PART_BEG].row = Pixel2Row(y); 1771 rc[PART_BEG].row = Pixel2Row (y);
1675/* round up */ 1772 /* round up */
1676 rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); 1773 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
1677 rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); 1774 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
1678 1775
1679/* sanity checks */ 1776 /* sanity checks */
1680 for (i = PART_BEG; i < RC_COUNT; i++) { 1777 for (i = PART_BEG; i < RC_COUNT; i++)
1778 {
1681 MIN_IT(rc[i].col, R->TermWin.ncol - 1); 1779 MIN_IT (rc[i].col, TermWin.ncol - 1);
1682 MIN_IT(rc[i].row, R->TermWin.nrow - 1); 1780 MIN_IT (rc[i].row, TermWin.nrow - 1);
1683 } 1781 }
1684 1782
1685 D_SCREEN((stderr, "rxvt_scr_expose(x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)-(c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); 1783 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1686 1784
1687 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1785 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1688 fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, 1786 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1689 (rc[PART_END].col - rc[PART_BEG].col + 1));
1690 1787
1691 if (refresh) 1788 if (refresh)
1692 rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); 1789 scr_refresh (SLOW_REFRESH);
1693} 1790}
1694 1791
1695/* ------------------------------------------------------------------------- */ 1792/* ------------------------------------------------------------------------- */
1696/* 1793/*
1697 * Refresh the entire screen 1794 * Refresh the entire screen
1698 */ 1795 */
1699/* EXTPROTO */
1700void 1796void
1701rxvt_scr_touch(pR_ Bool refresh) 1797rxvt_term::scr_touch (bool refresh)
1702{ 1798{
1703 rxvt_scr_expose(aR_ 0, 0, R->TermWin.width, R->TermWin.height, refresh); 1799 scr_expose (0, 0, TermWin.width, TermWin.height, refresh);
1704} 1800}
1705 1801
1706/* ------------------------------------------------------------------------- */ 1802/* ------------------------------------------------------------------------- */
1707/* 1803/*
1708 * Move the display so that the line represented by scrollbar value Y is at 1804 * Move the display so that the line represented by scrollbar value Y is at
1709 * the top of the screen 1805 * the top of the screen
1710 */ 1806 */
1711/* EXTPROTO */
1712int 1807int
1713rxvt_scr_move_to(pR_ int y, int len) 1808rxvt_term::scr_move_to (int y, int len)
1714{ 1809{
1715 long p = 0; 1810 long p = 0;
1716 uint16_t oldviewstart; 1811 uint16_t oldviewstart;
1717 1812
1718 oldviewstart = R->TermWin.view_start; 1813 oldviewstart = TermWin.view_start;
1719 if (y < len) { 1814 if (y < len)
1815 {
1720 p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; 1816 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1721 p -= (long)(R->TermWin.nrow - 1); 1817 p -= (long) (TermWin.nrow - 1);
1722 p = max(p, 0); 1818 p = max (p, 0);
1723 } 1819 }
1724 R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); 1820 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1725 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, R->TermWin.view_start)); 1821 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1726 1822
1727 return rxvt_scr_changeview(aR_ oldviewstart); 1823 return scr_changeview (oldviewstart);
1728} 1824}
1729 1825
1730/* ------------------------------------------------------------------------- */ 1826/* ------------------------------------------------------------------------- */
1731/* 1827/*
1732 * Page the screen up/down nlines 1828 * Page the screen up/down nlines
1733 * direction should be UP or DN 1829 * direction should be UP or DN
1734 */ 1830 */
1735/* EXTPROTO */
1736int 1831int
1737rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1832rxvt_term::scr_page (enum page_dirn direction, int nlines)
1738{ 1833{
1739 int n; 1834 int n;
1740 uint16_t oldviewstart; 1835 uint16_t oldviewstart;
1741 1836
1742 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, R->TermWin.view_start)); 1837 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1743#ifdef DEBUG_STRICT 1838#ifdef DEBUG_STRICT
1744 assert((nlines >= 0) && (nlines <= R->TermWin.nrow)); 1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1745#endif 1840#endif
1746 oldviewstart = R->TermWin.view_start; 1841 oldviewstart = TermWin.view_start;
1747 if (direction == UP) { 1842 if (direction == UP)
1843 {
1748 n = R->TermWin.view_start + nlines; 1844 n = TermWin.view_start + nlines;
1749 R->TermWin.view_start = min(n, R->TermWin.nscrolled); 1845 TermWin.view_start = min (n, TermWin.nscrolled);
1750 } else { 1846 }
1847 else
1848 {
1751 n = R->TermWin.view_start - nlines; 1849 n = TermWin.view_start - nlines;
1752 R->TermWin.view_start = max(n, 0); 1850 TermWin.view_start = max (n, 0);
1753 } 1851 }
1754 return rxvt_scr_changeview(aR_ oldviewstart); 1852 return scr_changeview (oldviewstart);
1755} 1853}
1756 1854
1757/* INTPROTO */
1758int 1855int
1759rxvt_scr_changeview(pR_ uint16_t oldviewstart) 1856rxvt_term::scr_changeview (uint16_t oldviewstart)
1760{ 1857{
1761 if (R->TermWin.view_start != oldviewstart) { 1858 if (TermWin.view_start != oldviewstart)
1762 R->h->want_refresh = 1; 1859 {
1763#ifdef RXVT_GRAPHICS 1860 want_refresh = 1;
1764 if (rxvt_Gr_Displayed(aR))
1765 rxvt_Gr_scroll(aR_ 0);
1766#endif
1767 R->h->num_scr -= (R->TermWin.view_start - oldviewstart); 1861 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1862 }
1863
1769 return (int)(R->TermWin.view_start - oldviewstart); 1864 return (int) (TermWin.view_start - oldviewstart);
1770} 1865}
1771 1866
1772/* ------------------------------------------------------------------------- */ 1867/* ------------------------------------------------------------------------- */
1773/* EXTPROTO */
1774void 1868void
1775rxvt_scr_bell(pR) 1869rxvt_term::scr_bell ()
1776{ 1870{
1777#ifndef NO_BELL 1871#ifndef NO_BELL
1778# ifndef NO_MAPALERT 1872# ifndef NO_MAPALERT
1779# ifdef MAPALERT_OPTION 1873# ifdef MAPALERT_OPTION
1780 if (R->Options & Opt_mapAlert) 1874 if (Options & Opt_mapAlert)
1781# endif 1875# endif
1782 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 1876 XMapWindow (display->display, TermWin.parent[0]);
1783# endif 1877# endif
1784 if (R->Options & Opt_visualBell) { 1878 if (Options & Opt_visualBell)
1879 {
1785 rxvt_scr_rvideo_mode(aR_ !R->h->rvideo); /* refresh also done */ 1880 scr_rvideo_mode (!rvideo); /* refresh also done */
1786 rxvt_scr_rvideo_mode(aR_ !R->h->rvideo); /* refresh also done */ 1881 scr_rvideo_mode (!rvideo); /* refresh also done */
1882 }
1787 } else 1883 else
1788 XBell(R->Xdisplay, 0); 1884 XBell (display->display, 0);
1789#endif 1885#endif
1790} 1886}
1791 1887
1792/* ------------------------------------------------------------------------- */ 1888/* ------------------------------------------------------------------------- */
1793/* ARGSUSED */ 1889/* ARGSUSED */
1794/* EXTPROTO */
1795void 1890void
1796rxvt_scr_printscreen(pR_ int fullhist) 1891rxvt_term::scr_printscreen (int fullhist)
1797{ 1892{
1798#ifdef PRINTPIPE 1893#ifdef PRINTPIPE
1799 int i, r1, nrows, row_offset; 1894 int i, r1, nrows, row_offset;
1800 text_t *t; 1895 text_t *t;
1801 FILE *fd; 1896 FILE *fd;
1802 1897
1803 if ((fd = rxvt_popen_printer(aR)) == NULL) 1898 if ((fd = popen_printer ()) == NULL)
1804 return; 1899 return;
1805 nrows = R->TermWin.nrow; 1900 nrows = TermWin.nrow;
1806 row_offset = R->TermWin.saveLines; 1901 row_offset = TermWin.saveLines;
1807 if (!fullhist) 1902 if (!fullhist)
1808 row_offset -= R->TermWin.view_start; 1903 row_offset -= TermWin.view_start;
1809 else { 1904 else
1905 {
1810 nrows += R->TermWin.nscrolled; 1906 nrows += TermWin.nscrolled;
1811 row_offset -= R->TermWin.nscrolled; 1907 row_offset -= TermWin.nscrolled;
1812 } 1908 }
1813 1909
1814 for (r1 = 0; r1 < nrows; r1++) { 1910 for (r1 = 0; r1 < nrows; r1++)
1911 {
1815 t = R->screen.text[r1 + row_offset]; 1912 t = screen.text[r1 + row_offset];
1816 for (i = R->TermWin.ncol - 1; i >= 0; i--) 1913 for (i = TermWin.ncol - 1; i >= 0; i--)
1817 if (!isspace(t[i])) 1914 if (!isspace (t[i]))
1818 break; 1915 break;
1819 fprintf(fd, "%.*s\n", (i + 1), t); 1916 fprintf (fd, "%.*s\n", (i + 1), t);
1820 } 1917 }
1821 rxvt_pclose_printer(fd); 1918 pclose_printer (fd);
1822#endif 1919#endif
1823} 1920}
1824 1921
1825/* ------------------------------------------------------------------------- */ 1922/* ------------------------------------------------------------------------- */
1826/* 1923/*
1827 * Refresh the screen 1924 * Refresh the screen
1828 * R->drawn_text/R->drawn_rend contain the screen information before the update. 1925 * drawn_text/drawn_rend contain the screen information before the update.
1829 * R->screen.text/R->screen.rend contain what the screen will change to. 1926 * screen.text/screen.rend contain what the screen will change to.
1927 */
1928
1929#define FONT_WIDTH(X, Y) \
1930 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1931#define FONT_RBEAR(X, Y) \
1932 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1933#define FONT_LBEAR(X, Y) \
1934 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1935#define IS_FONT_CHAR(X, Y) \
1936 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1937
1938void
1939rxvt_term::scr_refresh (unsigned char refresh_type)
1940{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 rvid, /* reverse video this position */
1943 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */
1946 int i, /* tmp */
1947 row_offset; /* basic offset in screen structure */
1948#ifndef NO_CURSORCOLOR
1949 rend_t cc1; /* store colours at cursor position (s) */
1950#endif
1951 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1952 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1953
1954 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1955 return;
1956
1957 /*
1958 * A: set up vars
1830 */ 1959 */
1960 must_clear = 0;
1831 1961
1832#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD) 1962 refresh_count = 0;
1833# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink)) 1963
1834# define MONO_BOLD_FG(x, fg) MONO_BOLD(x) 1964 row_offset = TermWin.saveLines - TermWin.view_start;
1965
1966#ifdef XPM_BACKGROUND
1967 must_clear |= (bgPixmap.pixmap != None);
1968#endif
1969#ifdef TRANSPARENT
1970 must_clear |= ((Options & Opt_transparent) && am_transparent);
1971#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973
1974 /*
1975 * B: reverse any characters which are selected
1976 */
1977 scr_reverse_selection ();
1978
1979 /*
1980 * C: set the cursor character (s)
1981 */
1982 {
1983 unsigned char setoldcursor;
1984 rend_t ccol1, /* Cursor colour */
1985 ccol2; /* Cursor colour2 */
1986
1987 showcursor = (screen.flags & Screen_VisibleCursor);
1988#ifdef CURSOR_BLINK
1989 if (hidden_cursor)
1990 showcursor = 0;
1991#endif
1992
1993 if (showcursor)
1994 {
1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1996
1997 if (showcursor && TermWin.focus)
1998 {
1999 *srp ^= RS_RVid;
2000#ifndef NO_CURSORCOLOR
2001 cc1 = *srp & (RS_fgMask | RS_bgMask);
2002 if (ISSET_PIXCOLOR (Color_cursor))
2003 ccol1 = Color_cursor;
2004 else
2005#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2006 ccol1 = GET_FGCOLOR (rstyle);
1835#else 2007#else
1836# define MONO_BOLD(x) \ 2008 ccol1 = Color_fg;
1837 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg)) 2009#endif
1838# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg) 2010 if (ISSET_PIXCOLOR (Color_cursor2))
2011 ccol2 = Color_cursor2;
2012 else
2013#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2014 ccol2 = GET_BGCOLOR (rstyle);
2015#else
2016 ccol2 = Color_bg;
2017#endif
2018 *srp = SET_FGCOLOR (*srp, ccol1);
2019 *srp = SET_BGCOLOR (*srp, ccol2);
2020#endif
2021 }
2022 }
2023
2024 /* make sure no outline cursor is left around */
2025 setoldcursor = 0;
2026 if (ocrow != -1)
2027 {
2028 if (screen.cur.row + TermWin.view_start != ocrow
2029 || screen.cur.col != oldcursor.col)
2030 {
2031 if (ocrow < TermWin.nrow
2032 && oldcursor.col < TermWin.ncol)
2033 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2034
2035 if (TermWin.focus || !showcursor)
2036 oldcursor.row = -1;
2037 else
2038 setoldcursor = 1;
2039 }
2040 }
2041 else if (!TermWin.focus)
2042 setoldcursor = 1;
2043
2044 if (setoldcursor)
2045 {
2046 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2047 oldcursor.row = -1;
2048 else
2049 {
2050 oldcursor.row = screen.cur.row + TermWin.view_start;
2051 oldcursor.col = screen.cur.col;
2052 }
2053 }
2054 }
2055
2056#ifndef NO_SLOW_LINK_SUPPORT
2057 /*
2058 * D: CopyArea pass - very useful for slower links
2059 * This has been deliberately kept simple.
2060 */
2061 i = num_scr;
2062 if (!display->is_local
2063 && refresh_type == FAST_REFRESH && num_scr_allow && i
2064 && abs (i) < TermWin.nrow && !must_clear)
2065 {
2066 int16_t nits;
2067 int j;
2068 rend_t *drp2;
2069 text_t *dtp2;
2070 int len, wlen;
2071
2072 j = TermWin.nrow;
2073 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1;
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 {
2077 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2078 {
2079 stp = screen.text[row + row_offset];
2080 srp = screen.rend[row + row_offset];
2081 dtp = drawn_text[row];
2082 dtp2 = drawn_text[row + i];
2083 drp = drawn_rend[row];
2084 drp2 = drawn_rend[row + i];
2085
2086 for (nits = 0, col = TermWin.ncol; col--; )
2087 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2088 nits--;
2089 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2090 nits++;
2091
2092 if (nits > 8) /* XXX: arbitrary choice */
2093 {
2094 for (col = TermWin.ncol; col--; )
2095 {
2096 *dtp++ = *dtp2++;
2097 *drp++ = *drp2++;
2098 }
2099
2100 if (len == -1)
2101 len = row;
2102
2103 wlen = row;
2104 continue;
2105 }
2106 }
2107
2108 if (len != -1)
2109 {
2110 /* also comes here at end if needed because of >= above */
2111 if (wlen < len)
2112 SWAP_IT (wlen, len, int);
2113
2114 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2115 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2116 TermWin.gc, 0, Row2Pixel (len + i),
2117 (unsigned int)TermWin_TotalWidth (),
2118 (unsigned int)Height2Pixel (wlen - len + 1),
2119 0, Row2Pixel (len));
2120 len = -1;
2121 }
2122 }
2123 }
2124#endif
2125
2126 /*
2127 * E: main pass across every character
2128 */
2129 for (row = 0; row < TermWin.nrow; row++)
2130 {
2131 stp = screen.text[row + row_offset];
2132 srp = screen.rend[row + row_offset];
2133 dtp = drawn_text[row];
2134 drp = drawn_rend[row];
2135
2136 /*
2137 * E2: OK, now the real pass
2138 */
2139 int ypixel = (int)Row2Pixel (row);
2140
2141 for (col = 0; col < TermWin.ncol; col++)
2142 {
2143 /* compare new text with old - if exactly the same then continue */
2144 if (stp[col] == dtp[col] /* Must match characters to skip. */
2145 && (srp[col] == drp[col] /* Either rendition the same or */
2146 || (stp[col] == ' ' /* space w/ no background change */
2147 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2148 continue;
2149
2150 // redraw one or more characters
2151
2152 // seek to the beginning if wide characters
2153 while (stp[col] == NOCHAR && col > 0)
2154 --col;
2155
2156 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2157 text_t *text = stp + col;
2158 int count = 1;
2159
2160 dtp[col] = stp[col];
2161 drp[col] = rend;
2162
2163 int xpixel = Col2Pixel (col);
2164
2165 // this loop looks very messy, it can probably be optimized
2166 // and cleaned a bit by you?
2167 for (i = 0; ++col < TermWin.ncol; )
2168 {
2169 if (stp[col] == NOCHAR)
2170 {
2171 dtp[col] = stp[col];
2172 drp[col] = rend;
2173 count++;
2174
2175 if (i) // only possible skip if char unchanged
2176 i++;
2177
2178 continue;
2179 }
2180
2181 if (rend != srp[col])
2182 break;
2183
2184 count++;
2185
2186 if (stp[col] != dtp[col]
2187 || srp[col] != drp[col])
2188 {
2189 if (must_clear && (i++ > (count / 2)))
2190 break;
2191
2192 dtp[col] = stp[col];
2193 drp[col] = rend;
2194 i = 0;
2195 }
2196 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2197 break;
2198 }
2199
2200 col--; /* went one too far. move back */
2201 count -= i; /* dump any matching trailing chars */
2202
2203 /*
2204 * Determine the attributes for the string
2205 */
2206 int fid = GET_FONT (rend);
2207 int fore = GET_FGCOLOR (rend); // desired foreground
2208 int back = GET_BGCOLOR (rend); // desired background
2209
2210 rend = GET_ATTR (rend);
2211
2212 rvid = !!(rend & RS_RVid);
2213
2214#ifndef NO_BOLD_UNDERLINE_REVERSE
2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2216 {
2217 if (ISSET_PIXCOLOR (Color_BD))
2218 fore = Color_BD;
2219 else
2220 rvid = !rvid;
2221 }
2222
2223 if (rend & RS_Uline)
2224 if (ISSET_PIXCOLOR (Color_UL))
2225 fore = Color_UL;
2226#endif
2227
2228 if (rvid)
2229 {
2230 SWAP_IT (fore, back, int);
2231
2232#ifndef NO_BOLD_UNDERLINE_REVERSE
2233 if (ISSET_PIXCOLOR (Color_RV)
2234# ifndef NO_CURSORCOLOR
2235 && !ISSET_PIXCOLOR (Color_cursor)
1839#endif 2236# endif
1840 2237 )
1841#define FONT_WIDTH(X, Y) \ 2238 back = Color_RV;
1842 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1843#define FONT_RBEAR(X, Y) \
1844 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1845#define FONT_LBEAR(X, Y) \
1846 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing
1847#define IS_FONT_CHAR(X, Y) \
1848 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1849
1850/* EXTPROTO */
1851void
1852rxvt_scr_refresh(pR_ unsigned char refresh_type)
1853{
1854 unsigned char clearfirst, /* first character writes before cell */
1855 clearlast, /* last character writes beyond cell */
1856 must_clear, /* use draw_string not draw_image_string */
1857#ifndef NO_BOLDFONT
1858 bfont, /* we've changed font to bold font */
1859#endif 2239#endif
1860 rvid, /* reverse video this position */ 2240 }
1861 wbyte, /* we're in multibyte */ 2241
1862 showcursor; /* show the cursor */ 2242#ifdef TEXT_BLINK
1863 int fore, back; /* desired foreground/background */ 2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
1864 int16_t col, row, /* column/row we're processing */ 2244 {
1865 ocrow; /* old cursor row */ 2245 if (!text_blink_ev.active)
1866 int cursorwidth; 2246 {
1867 int i, /* tmp */ 2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1868 row_offset; /* basic offset in screen structure */ 2248 hidden_text = 0;
2249 }
2250 else if (hidden_text)
2251 fore = back;
2252 }
2253#endif
2254
2255 /*
2256 * Actually do the drawing of the string here
2257 */
2258 rxvt_font *font = (*TermWin.fontset)[fid];
2259
2260 if (back == fore)
2261 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2262 TermWin.fwidth * count, TermWin.fheight,
2263 back);
2264 else if (back == Color_bg)
2265 {
2266 if (must_clear)
2267 {
2268 CLEAR_CHARS (xpixel, ypixel, count);
2269
2270 for (i = 0; i < count; i++) /* don't draw empty strings */
2271 if (text[i] != ' ')
2272 {
2273 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2274 break;
2275 }
2276 }
2277 else
2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2279 }
2280 else
2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2282
2283 if (rend & RS_Uline && font->descent > 1 && fore != back)
2284 XDrawLine (display->display, drawBuffer, TermWin.gc,
2285 xpixel, ypixel + font->ascent + 1,
2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2287 } /* for (col....) */
2288 } /* for (row....) */
2289
2290 /*
2291 * G: cleanup cursor and display outline cursor if necessary
2292 */
2293 if (showcursor)
2294 {
2295 if (TermWin.focus)
2296 {
2297 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2298 [screen.cur.col]);
2299 *srp ^= RS_RVid;
1869#ifndef NO_CURSORCOLOR 2300#ifndef NO_CURSORCOLOR
1870 rend_t cc1; /* store colours at cursor position(s) */ 2301 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
1871 rend_t cc2; /* store colours at cursor position(s) */
1872#endif 2302#endif
1873 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2303 }
1874 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2304 else if (oldcursor.row >= 0)
1875 char *buffer; /* local copy of R->h->buffer */
1876 struct rxvt_hidden *h = R->h;
1877
1878 if (refresh_type == NO_REFRESH || !R->TermWin.mapped)
1879 return;
1880
1881/*
1882 * A: set up vars
1883 */
1884 clearfirst = clearlast = must_clear = wbyte = 0;
1885#ifndef NO_BOLDFONT
1886 bfont = 0;
1887#endif
1888
1889 if (h->currmaxcol < R->TermWin.ncol) {
1890 h->currmaxcol = R->TermWin.ncol;
1891 h->buffer = (char *)rxvt_realloc (h->buffer,
1892 sizeof(char) * (h->currmaxcol + 1) * MB_CUR_MAX);
1893 }
1894 buffer = h->buffer;
1895 h->refresh_count = 0;
1896
1897 row_offset = R->TermWin.saveLines - R->TermWin.view_start;
1898
1899 if ((refresh_type & REFRESH_BOUNDS)) {
1900 clearfirst = clearlast = 1;
1901 h->refresh_type &= ~REFRESH_BOUNDS;
1902 }
1903#if defined(XPM_BACKGROUND)
1904 must_clear |= (h->bgPixmap.pixmap != None);
1905#endif
1906#if defined(TRANSPARENT)
1907 must_clear |= ((R->Options & Opt_transparent) && h->am_transparent);
1908#endif
1909 ocrow = h->oldcursor.row; /* is there an old outline cursor on screen? */
1910
1911/*
1912 * B: reverse any characters which are selected
1913 */
1914 rxvt_scr_reverse_selection(aR);
1915
1916/*
1917 * C: set the cursor character(s)
1918 */
1919 {
1920 unsigned char setoldcursor;
1921 rend_t ccol1, /* Cursor colour */
1922 ccol2; /* Cursor colour2 */
1923
1924 showcursor = (R->screen.flags & Screen_VisibleCursor);
1925 cursorwidth = 0;
1926#ifdef CURSOR_BLINK
1927 if (R->h->hidden_cursor)
1928 showcursor = 0;
1929#endif
1930
1931 cursorwidth = 0;
1932
1933 if (showcursor)
1934 { 2305 {
2306#ifndef NO_CURSORCOLOR
2307 if (ISSET_PIXCOLOR (Color_cursor))
2308 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2309#endif
2310 int cursorwidth = 1;
2311 while (oldcursor.col + cursorwidth < TermWin.ncol
2312 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
1935 cursorwidth++; 2313 cursorwidth++;
1936 2314
1937 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 2315 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
1938 [R->screen.cur.col]); 2316 Col2Pixel (oldcursor.col),
1939 2317 Row2Pixel (oldcursor.row),
1940 if (showcursor && R->TermWin.focus) 2318 (unsigned int) (Width2Pixel (cursorwidth) - 1),
1941 { 2319 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
1942 *srp ^= RS_RVid;
1943#ifndef NO_CURSORCOLOR
1944 cc1 = *srp & (RS_fgMask | RS_bgMask);
1945 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_cursor))
1946 ccol1 = Color_cursor;
1947 else
1948#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1949 ccol1 = GET_FGCOLOR(h->rstyle);
1950#else
1951 ccol1 = Color_fg;
1952#endif
1953 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_cursor2))
1954 ccol2 = Color_cursor2;
1955 else
1956#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1957 ccol2 = GET_BGCOLOR(h->rstyle);
1958#else
1959 ccol2 = Color_bg;
1960#endif
1961 *srp = SET_FGCOLOR(*srp, ccol1);
1962 *srp = SET_BGCOLOR(*srp, ccol2);
1963#endif
1964 }
1965
1966 while (IS_WIDE (*srp))
1967 cursorwidth++, srp++;
1968 } 2320 }
1969
1970 /* make sure no outline cursor is left around */
1971 setoldcursor = 0;
1972 if (ocrow != -1) {
1973 if (R->screen.cur.row + R->TermWin.view_start != ocrow
1974 || R->screen.cur.col != h->oldcursor.col) {
1975 if (ocrow < R->TermWin.nrow
1976 && h->oldcursor.col < R->TermWin.ncol) {
1977 R->drawn_rend[ocrow][h->oldcursor.col] ^= (RS_RVid | RS_Uline);
1978 }
1979 if (R->TermWin.focus || !showcursor)
1980 h->oldcursor.row = -1;
1981 else
1982 setoldcursor = 1;
1983 } 2321 }
1984 } else if (!R->TermWin.focus)
1985 setoldcursor = 1;
1986 if (setoldcursor) {
1987 if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow)
1988 h->oldcursor.row = -1;
1989 else {
1990 h->oldcursor.row = R->screen.cur.row + R->TermWin.view_start;
1991 h->oldcursor.col = R->screen.cur.col;
1992 }
1993 }
1994 }
1995 2322
1996#ifndef NO_SLOW_LINK_SUPPORT 2323 /*
1997/*
1998 * D: CopyArea pass - very useful for slower links
1999 * This has been deliberately kept simple.
2000 */
2001 i = h->num_scr;
2002 if (refresh_type == FAST_REFRESH && h->num_scr_allow && i
2003 && abs(i) < R->TermWin.nrow && !must_clear) {
2004 int16_t nits;
2005 int j;
2006 rend_t *drp2;
2007 text_t *dtp2;
2008 int len, wlen;
2009
2010 j = R->TermWin.nrow;
2011 wlen = len = -1;
2012 row = i > 0 ? 0 : j - 1;
2013 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) {
2014 if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) {
2015 stp = R->screen.text[row + row_offset];
2016 srp = R->screen.rend[row + row_offset];
2017 dtp = R->drawn_text[row];
2018 dtp2 = R->drawn_text[row + i];
2019 drp = R->drawn_rend[row];
2020 drp2 = R->drawn_rend[row + i];
2021 for (nits = 0, col = R->TermWin.ncol; col--; )
2022 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2023 nits--;
2024 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2025 nits++;
2026 if (nits > 8) { /* XXX: arbitrary choice */
2027 for (col = R->TermWin.ncol; col--; ) {
2028 *dtp++ = *dtp2++;
2029 *drp++ = *drp2++;
2030 }
2031 if (len == -1)
2032 len = row;
2033 wlen = row;
2034 continue;
2035 }
2036 }
2037 if (len != -1) {
2038 /* also comes here at end if needed because of >= above */
2039 if (wlen < len)
2040 SWAP_IT(wlen, len, int);
2041 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2042 XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt,
2043 R->TermWin.gc, 0, Row2Pixel(len + i),
2044 (unsigned int)TermWin_TotalWidth(),
2045 (unsigned int)Height2Pixel(wlen - len + 1),
2046 0, Row2Pixel(len));
2047 len = -1;
2048 }
2049 }
2050 }
2051#endif
2052
2053/*
2054 * E: main pass across every character
2055 */
2056 for (row = 0; row < R->TermWin.nrow; row++)
2057 {
2058 stp = R->screen.text[row + row_offset];
2059 srp = R->screen.rend[row + row_offset];
2060 dtp = R->drawn_text[row];
2061 drp = R->drawn_rend[row];
2062
2063/*
2064 * E2: OK, now the real pass
2065 */
2066 int ypixel = (int)Row2Pixel(row);
2067
2068 for (col = 0; col < R->TermWin.ncol; col++) {
2069 /* compare new text with old - if exactly the same then continue */
2070 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2071
2072 if (stp[col] == dtp[col] /* Must match characters to skip. */
2073 && (rend == drp[col] /* Either rendition the same or */
2074 || (stp[col] == ' ' /* space w/ no background change */
2075 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2076 continue;
2077
2078 text_t *text = stp + col;
2079 int count = 1;
2080
2081 /* redraw one or more characters */
2082
2083 dtp[col] = stp[col];
2084 drp[col] = rend;
2085
2086 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2087 continue;
2088
2089 int xpixel = Col2Pixel(col);
2090
2091 // this loop looks very messy, it can probably be optimized
2092 // and cleaned a bit by you?
2093 for (i = 0; ++col < R->TermWin.ncol; )
2094 {
2095 if (stp[col] == NOCHAR)
2096 {
2097 dtp[col] = stp[col];
2098 drp[col] = rend;
2099 count++;
2100
2101 if (i) // only possible skip if char unchanged
2102 i++;
2103
2104 continue;
2105 }
2106
2107 if (((rend ^ srp[col]) & ~RS_wide) != 0)
2108 break;
2109
2110 count++;
2111
2112 if (stp[col] != dtp[col]
2113 || srp[col] != drp[col])
2114 {
2115 if (must_clear && (i++ > (count / 2)))
2116 break;
2117
2118 dtp[col] = stp[col];
2119 drp[col] = rend;
2120 i = 0;
2121 }
2122 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2123 break;
2124 }
2125
2126 col--; /* went one too far. move back */
2127 count -= i; /* dump any matching trailing chars */
2128
2129/*
2130 * Determine the attributes for the string
2131 */
2132 int fid = GET_FONT(rend);
2133 fore = GET_FGCOLOR(rend);
2134 back = GET_BGCOLOR(rend);
2135 rend = GET_ATTR(rend);
2136
2137 rvid = (rend & RS_RVid) ? 1 : 0;
2138#ifdef OPTION_HC
2139 if (!rvid && (rend & RS_Blink))
2140 {
2141 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_HC))
2142 back = Color_HC;
2143 else
2144 rvid = !rvid; /* fall back */
2145 }
2146#endif
2147 if (rvid)
2148 {
2149 SWAP_IT(fore, back, int);
2150
2151#ifndef NO_BOLD_UNDERLINE_REVERSE
2152 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_RV)
2153# ifndef NO_CURSORCOLOR
2154 && !ISSET_PIXCOLOR(h, Color_cursor)
2155# endif
2156 )
2157 back = Color_RV;
2158#endif
2159 }
2160#ifndef NO_BOLD_UNDERLINE_REVERSE
2161 else if (rend & RS_Bold)
2162 {
2163 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_BD))
2164 {
2165 fore = Color_BD;
2166# ifndef VERYBOLD
2167 rend &= ~RS_Bold; /* we've taken care of it */
2168# endif
2169 }
2170 }
2171 else if (rend & RS_Uline)
2172 {
2173 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_UL))
2174 {
2175 fore = Color_UL;
2176 rend &= ~RS_Uline; /* we've taken care of it */
2177 }
2178 }
2179#endif
2180
2181/*
2182 * Actually do the drawing of the string here
2183 */
2184 rxvt_font *font = (*R->TermWin.fontset)[fid];
2185
2186 if (back == Color_bg)
2187 {
2188 if (must_clear)
2189 {
2190 for (i = 0; i < count; i++) /* don't draw empty strings */
2191 if (text[i] != ' ') {
2192 font->draw (xpixel, ypixel, text, count, fore, -1);
2193 goto nodraw;
2194 }
2195 CLEAR_CHARS(xpixel, ypixel, count);
2196nodraw: ;
2197 }
2198 else
2199 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2200 } else
2201 font->draw (xpixel, ypixel, text, count, fore, back);
2202
2203 if ((rend & RS_Uline) && (font->descent > 1))
2204 XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc,
2205 xpixel, ypixel + font->ascent + 1,
2206 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1);
2207 } /* for (col....) */
2208 } /* for (row....) */
2209
2210/*
2211 * G: cleanup cursor and display outline cursor if necessary
2212 */
2213 if (showcursor) {
2214 if (R->TermWin.focus) {
2215 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines]
2216 [R->screen.cur.col]);
2217 *srp ^= RS_RVid;
2218#ifndef NO_CURSORCOLOR
2219 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1;
2220#endif
2221 } else if (h->oldcursor.row >= 0) {
2222#ifndef NO_CURSORCOLOR
2223 unsigned long gcmask; /* Graphics Context mask */
2224
2225 if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_cursor)) {
2226 XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]);
2227 }
2228#endif
2229 XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc,
2230 Col2Pixel(h->oldcursor.col),
2231 Row2Pixel(h->oldcursor.row),
2232 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2233 (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1));
2234 }
2235 }
2236/*
2237 * H: cleanup selection 2324 * H: cleanup selection
2238 */ 2325 */
2239 rxvt_scr_reverse_selection(aR); 2326 scr_reverse_selection ();
2240 2327
2241/*
2242 * I: other general cleanup
2243 */
2244 if (clearfirst && R->TermWin.int_bwidth)
2245 /*
2246 * clear the whole screen height, note that width == 0 is treated
2247 * specially by XClearArea
2248 */
2249 XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0,
2250 (unsigned int)R->TermWin.int_bwidth,
2251 (unsigned int)TermWin_TotalHeight(), False);
2252 if (clearlast && R->TermWin.int_bwidth)
2253 /*
2254 * clear the whole screen height, note that width == 0 is treated
2255 * specially by XClearArea
2256 */
2257 XClearArea(R->Xdisplay, R->TermWin.vt,
2258 R->TermWin.width + R->TermWin.int_bwidth, 0,
2259 (unsigned int)R->TermWin.int_bwidth,
2260 (unsigned int)TermWin_TotalHeight(), False);
2261 if (refresh_type & SMOOTH_REFRESH) 2328 if (refresh_type & SMOOTH_REFRESH)
2262 XSync(R->Xdisplay, False); 2329 XFlush (display->display);
2263 2330
2264 h->num_scr = 0; 2331 num_scr = 0;
2265 h->num_scr_allow = 1; 2332 num_scr_allow = 1;
2266 h->want_refresh = 0; /* screen is current */ 2333 want_refresh = 0; /* screen is current */
2267} 2334}
2268/* ------------------------------------------------------------------------- */
2269 2335
2270/* EXTPROTO */
2271void 2336void
2272rxvt_scr_clear(pR) 2337rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2273{ 2338{
2339 if (!rp || !tp)
2340 return;
2341
2342 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2343 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2344}
2345
2346void
2347rxvt_term::scr_remap_chars ()
2348{
2349 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2350 scr_remap_chars (screen.text[i], screen.rend[i]);
2351
2352 for (int i = TermWin.nrow; i--; )
2353 {
2354 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2355 scr_remap_chars (swap.text[i], swap.rend[i]);
2356 }
2357}
2358
2359/* ------------------------------------------------------------------------- */
2360void
2361rxvt_term::scr_clear (bool really)
2362{
2274 if (!R->TermWin.mapped) 2363 if (!TermWin.mapped)
2275 return; 2364 return;
2365
2276 R->h->num_scr_allow = 0; 2366 num_scr_allow = 0;
2277 R->h->want_refresh = 1; 2367 want_refresh = 1;
2368
2278#ifdef TRANSPARENT 2369#ifdef TRANSPARENT
2279 if ((R->Options & Opt_transparent) && (R->h->am_pixmap_trans == 0)) { 2370 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2280 int i; 2371 {
2372 int i;
2281 2373
2282 if (!(R->Options & Opt_transparent_all)) 2374 if (! (Options & Opt_transparent_all))
2283 i = 0; 2375 i = 0;
2284 else 2376 else
2285 i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2377 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2286 for (; i--;) 2378
2379 while (i--)
2287 if (R->TermWin.parent[i] != None) 2380 if (TermWin.parent[i] != None)
2288 XClearWindow(R->Xdisplay, R->TermWin.parent[i]); 2381 XClearWindow (display->display, TermWin.parent[i]);
2289 } 2382 }
2290#endif 2383#endif
2384
2385 if (really)
2291 XClearWindow(R->Xdisplay, R->TermWin.vt); 2386 XClearWindow (display->display, TermWin.vt);
2292} 2387}
2293 2388
2294/* ------------------------------------------------------------------------- */ 2389/* ------------------------------------------------------------------------- */
2295/* INTPROTO */
2296void 2390void
2297rxvt_scr_reverse_selection(pR) 2391rxvt_term::scr_reverse_selection ()
2298{ 2392{
2299 int i, col, row, end_row;
2300 rend_t *srp;
2301
2302 if (R->selection.op && R->h->current_screen == R->selection.screen) { 2393 if (selection.op && current_screen == selection.screen)
2394 {
2303 end_row = R->TermWin.saveLines - R->TermWin.view_start; 2395 int end_row = TermWin.saveLines - TermWin.view_start;
2304 i = R->selection.beg.row + R->TermWin.saveLines; 2396 int i = selection.beg.row + TermWin.saveLines;
2305 row = R->selection.end.row + R->TermWin.saveLines; 2397 int col, row = selection.end.row + TermWin.saveLines;
2398 rend_t *srp;
2399
2306 if (i >= end_row) 2400 if (i >= end_row)
2307 col = R->selection.beg.col; 2401 col = selection.beg.col;
2308 else { 2402 else
2403 {
2309 col = 0; 2404 col = 0;
2310 i = end_row; 2405 i = end_row;
2311 } 2406 }
2407
2312 end_row += R->TermWin.nrow; 2408 end_row += TermWin.nrow;
2313 for (; i < row && i < end_row; i++, col = 0) 2409 for (; i < row && i < end_row; i++, col = 0)
2314 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2410 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2315#ifndef OPTION_HC
2316 srp[col] ^= RS_RVid; 2411 srp[col] ^= RS_RVid;
2317#else 2412
2318 srp[col] ^= RS_Blink;
2319#endif
2320 if (i == row && i < end_row) 2413 if (i == row && i < end_row)
2321 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2414 for (srp = screen.rend[i]; col < selection.end.col; col++)
2322#ifndef OPTION_HC
2323 srp[col] ^= RS_RVid; 2415 srp[col] ^= RS_RVid;
2324#else
2325 srp[col] ^= RS_Blink;
2326#endif
2327 } 2416 }
2328} 2417}
2329 2418
2330/* ------------------------------------------------------------------------- */ 2419/* ------------------------------------------------------------------------- */
2331/* 2420/*
2332 * Dump the whole scrollback and screen to the passed filedescriptor. The 2421 * Dump the whole scrollback and screen to the passed filedescriptor. The
2333 * invoking routine must close the fd. 2422 * invoking routine must close the fd.
2334 */ 2423 */
2335#if 0 2424#if 0
2336/* EXTPROTO */
2337void 2425void
2338rxvt_scr_dump(pR_ int fd) 2426rxvt_term::scr_dump (int fd)
2339{ 2427{
2340 int row, wrote; 2428 int row, wrote;
2341 unsigned int width, towrite; 2429 unsigned int width, towrite;
2342 char r1[] = "\n"; 2430 char r1[] = "\n";
2343 2431
2344 for (row = R->TermWin.saveLines - R->TermWin.nscrolled; 2432 for (row = TermWin.saveLines - TermWin.nscrolled;
2345 row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { 2433 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2434 {
2346 width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] 2435 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2347 : R->TermWin.ncol; 2436 : TermWin.ncol;
2348 for (towrite = width; towrite; towrite -= wrote) { 2437 for (towrite = width; towrite; towrite -= wrote)
2438 {
2349 wrote = write(fd, &(R->screen.text[row][width - towrite]), 2439 wrote = write (fd, & (screen.text[row][width - towrite]),
2350 towrite); 2440 towrite);
2351 if (wrote < 0) 2441 if (wrote < 0)
2352 return; /* XXX: death, no report */ 2442 return; /* XXX: death, no report */
2353 } 2443 }
2354 if (R->screen.tlen[row] >= 0) 2444 if (screen.tlen[row] >= 0)
2355 if (write(fd, r1, 1) <= 0) 2445 if (write (fd, r1, 1) <= 0)
2356 return; /* XXX: death, no report */ 2446 return; /* XXX: death, no report */
2357 } 2447 }
2358} 2448}
2359#endif 2449#endif
2360 2450
2361/* ------------------------------------------------------------------------- * 2451/* ------------------------------------------------------------------------- *
2362 * CHARACTER SELECTION * 2452 * CHARACTER SELECTION *
2363 * ------------------------------------------------------------------------- */ 2453 * ------------------------------------------------------------------------- */
2364 2454
2365/* 2455/*
2366 * -R->TermWin.nscrolled <= (selection row) <= R->TermWin.nrow - 1 2456 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2367 */ 2457 */
2368/* EXTPROTO */
2369void 2458void
2370rxvt_selection_check(pR_ int check_more) 2459rxvt_term::selection_check (int check_more)
2371{ 2460{
2372 row_col_t pos; 2461 row_col_t pos;
2373 2462
2374 if (!R->selection.op) 2463 if (!selection.op)
2375 return; 2464 return;
2376 2465
2377 pos.row = pos.col = 0; 2466 pos.row = pos.col = 0;
2378 if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) 2467 if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
2379 || (R->selection.beg.row >= R->TermWin.nrow) 2468 || (selection.beg.row >= TermWin.nrow)
2380 || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) 2469 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2381 || (R->selection.mark.row >= R->TermWin.nrow) 2470 || (selection.mark.row >= TermWin.nrow)
2382 || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) 2471 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2383 || (R->selection.end.row >= R->TermWin.nrow) 2472 || (selection.end.row >= TermWin.nrow)
2384 || (check_more == 1 2473 || (check_more == 1
2385 && R->h->current_screen == R->selection.screen 2474 && current_screen == selection.screen
2386 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 2475 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2387 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) 2476 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2388 || (check_more == 2 2477 || (check_more == 2
2389 && ROWCOL_IS_BEFORE(R->selection.beg, pos) 2478 && ROWCOL_IS_BEFORE (selection.beg, pos)
2390 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2479 && ROWCOL_IS_AFTER (selection.end, pos))
2391 || (check_more == 3 2480 || (check_more == 3
2392 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2481 && ROWCOL_IS_AFTER (selection.end, pos))
2393 || (check_more == 4 /* screen width change */ 2482 || (check_more == 4 /* screen width change */
2394 && (R->selection.beg.row != R->selection.end.row 2483 && (selection.beg.row != selection.end.row
2395 || R->selection.end.col > R->TermWin.ncol))) 2484 || selection.end.col > TermWin.ncol)))
2396 CLEAR_SELECTION(R); 2485 CLEAR_SELECTION ();
2397} 2486}
2398 2487
2399/* ------------------------------------------------------------------------- */ 2488/* ------------------------------------------------------------------------- */
2400/* 2489/*
2401 * Paste a selection direct to the command fd 2490 * Paste a selection direct to the command fd
2402 */ 2491 */
2403/* INTPROTO */
2404void 2492void
2405rxvt_PasteIt(pR_ const unsigned char *data, unsigned int nitems) 2493rxvt_term::paste (const unsigned char *data, unsigned int len)
2406{ 2494{
2407 unsigned int i, j, n; 2495 unsigned int i, j, n;
2408 unsigned char *ds = (unsigned char *)rxvt_malloc(PROP_SIZE); 2496 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2409 2497
2498#if 0
2499 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2500 ZERO_SCROLLBACK (r);
2501#endif
2502
2410/* convert normal newline chars into common keyboard Return key sequence */ 2503 /* convert normal newline chars into common keyboard Return key sequence */
2411 for (i = 0; i < nitems; i += PROP_SIZE) { 2504 for (i = 0; i < len; i += PROP_SIZE)
2505 {
2412 n = min(nitems - i, PROP_SIZE); 2506 n = min (len - i, PROP_SIZE);
2413 MEMCPY(ds, data + i, n); 2507 MEMCPY (ds, data + i, n);
2508
2414 for (j = 0; j < n; j++) 2509 for (j = 0; j < n; j++)
2415 if (ds[j] == '\n') 2510 if (ds[j] == C0_LF)
2416 ds[j] = '\r'; 2511 ds[j] = C0_CR;
2417 rxvt_tt_write(aR_ ds, (int)n); 2512
2513 tt_write (ds, (int)n);
2418 } 2514 }
2515
2419 free(ds); 2516 free (ds);
2420} 2517}
2421 2518
2422/* ------------------------------------------------------------------------- */ 2519/* ------------------------------------------------------------------------- */
2423/* 2520/*
2424 * Respond to a notification that a primary selection has been sent 2521 * Respond to a notification that a primary selection has been sent
2425 * EXT: SelectionNotify 2522 * EXT: SelectionNotify
2426 */ 2523 */
2427/* EXTPROTO */
2428int 2524int
2429rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2525rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2430{ 2526{
2431 long nread = 0; 2527 long nread = 0;
2432 unsigned long bytes_after; 2528 unsigned long bytes_after;
2433 XTextProperty ct; 2529 XTextProperty ct;
2434#ifdef MULTICHAR_SET
2435 int dummy_count;
2436 char **cl;
2437#endif
2438 2530
2439 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->h->selection_wait)); 2531 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2440 2532
2441 if (prop == None) { /* check for failed XConvertSelection */ 2533 if (prop == None) /* check for failed XConvertSelection */
2442#ifdef MULTICHAR_SET 2534 {
2443 if ((R->h->selection_type & Sel_CompoundText)) { 2535 if ((selection_type & Sel_CompoundText))
2536 {
2444 int selnum = R->h->selection_type & Sel_whereMask; 2537 int selnum = selection_type & Sel_whereMask;
2445 2538
2446 R->h->selection_type = 0; 2539 selection_type = 0;
2447 if (selnum != Sel_direct) 2540 if (selnum != Sel_direct)
2448 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2541 selection_request_other (XA_STRING, selnum);
2449 } 2542 }
2450#endif 2543
2451 return 0; 2544 if ((selection_type & Sel_UTF8String))
2545 {
2546 int selnum = selection_type & Sel_whereMask;
2547
2548 selection_type = Sel_CompoundText;
2549 if (selnum != Sel_direct)
2550 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2551 else
2552 selection_type = 0;
2553 }
2554
2555 return 0;
2452 } 2556 }
2557
2453 for (;;) { 2558 for (;;)
2559 {
2454 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2560 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2455 (long)(PROP_SIZE / 4), delete_prop, 2561 (long) (PROP_SIZE / 4), delete_prop,
2456 AnyPropertyType, &ct.encoding, &ct.format, 2562 AnyPropertyType, &ct.encoding, &ct.format,
2457 &ct.nitems, &bytes_after, 2563 &ct.nitems, &bytes_after,
2458 &ct.value) != Success) 2564 &ct.value) != Success)
2459 break; 2565 break;
2566
2460 if (ct.encoding == 0) { 2567 if (ct.encoding == 0)
2568 {
2461 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2462 break; 2570 break;
2463 } 2571 }
2572 else if (ct.encoding == xa[XA_INCR])
2573 {
2574 // INCR selection, start handshake
2575 XDeleteProperty (display->display, win, prop);
2576 selection_wait = Sel_incr;
2577 incr_ev.start (NOW + 10);
2578 break;
2579 }
2580
2464 if (ct.value == NULL) { 2581 if (ct.value == NULL)
2582 {
2465 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); 2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2466 continue; 2584 continue;
2467 } 2585 }
2586
2468 if (ct.nitems == 0) { 2587 if (ct.nitems == 0)
2588 {
2469 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2590
2470 if (R->h->selection_wait == Sel_normal && nread == 0) { 2591 if (selection_wait == Sel_normal && nread == 0
2471 /* 2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2593 {
2594 /*
2472 * pass through again trying CUT_BUFFER0 if we've come from 2595 * pass through again trying CUT_BUFFER0 if we've come from
2473 * XConvertSelection() but nothing was presented 2596 * XConvertSelection () but nothing was presented
2474 */ 2597 */
2475 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2598 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2476 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2599 selection_paste (display->root, XA_CUT_BUFFER0, False);
2600 }
2601
2602 nread = -1; /* discount any previous stuff */
2603 break;
2604 }
2605
2606 nread += ct.nitems;
2607
2608 char **cl;
2609 int cr;
2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2611 {
2612 for (int i = 0; i < cr; i++)
2613 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2614
2615 XFreeStringList (cl);
2616 }
2617 else
2618 paste (ct.value, ct.nitems);
2619
2620 if (bytes_after == 0)
2621 break;
2622
2623 XFree (ct.value);
2477 } 2624 }
2478 nread = -1; /* discount any previous stuff */ 2625
2479 break;
2480 }
2481 nread += ct.nitems;
2482#ifdef MULTICHAR_SET
2483 if (XmbTextPropertyToTextList(R->Xdisplay, &ct, &cl,
2484 &dummy_count) == Success && cl) {
2485 rxvt_PasteIt(aR_ cl[0], STRLEN(cl[0]));
2486 XFreeStringList(cl);
2487 } else
2488#endif
2489 rxvt_PasteIt(aR_ ct.value, (unsigned int)ct.nitems);
2490 if (bytes_after == 0)
2491 break;
2492 XFree(ct.value);
2493 }
2494 if (ct.value) 2626 if (ct.value)
2495 XFree(ct.value); 2627 XFree (ct.value);
2628
2496 if (R->h->selection_wait == Sel_normal) 2629 if (selection_wait == Sel_normal)
2497 R->h->selection_wait = Sel_none; 2630 selection_wait = Sel_none;
2631
2498 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2632 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2499 return (int)nread; 2633 return (int)nread;
2634}
2635
2636void
2637rxvt_term::incr_cb (time_watcher &w)
2638{
2639 selection_wait = Sel_none;
2640
2641 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2500} 2642}
2501 2643
2502/* 2644/*
2503 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2504 */ 2646 */
2505/* EXTPROTO */
2506void 2647void
2507rxvt_selection_property(pR_ Window win, Atom prop) 2648rxvt_term::selection_property (Window win, Atom prop)
2508{ 2649{
2509 int reget_time = 0; 2650 if (prop == None || selection_wait != Sel_incr)
2510
2511 if (prop == None)
2512 return;
2513 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2514 if (R->h->selection_wait == Sel_normal) {
2515 int a, afmt;
2516 Atom atype;
2517 unsigned long bytes_after, nitems;
2518 unsigned char *s = NULL;
2519
2520 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False,
2521 R->h->xa[XA_INCR], &atype, &afmt, &nitems,
2522 &bytes_after, &s);
2523 if (s)
2524 XFree(s);
2525 if (a != Success)
2526 return; 2651 return;
2527#ifndef __CYGWIN32__ 2652
2528 if (atype == R->h->xa[XA_INCR]) { /* start an INCR transfer */ 2653 if (selection_paste (win, prop, 1) > 0)
2529 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); 2654 incr_ev.start (NOW + 10);
2530 XDeleteProperty(R->Xdisplay, win, prop); 2655 else
2531 XFlush(R->Xdisplay);
2532 reget_time = 1;
2533 R->h->selection_wait = Sel_incr;
2534 }
2535#endif
2536 } else if (R->h->selection_wait == Sel_incr) {
2537 reget_time = 1;
2538 if (rxvt_selection_paste(aR_ win, prop, True) == -1) {
2539 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2540 R->h->selection_wait = Sel_none;
2541 R->h->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */
2542 }
2543 } 2656 {
2544 if (reget_time) { /* received more data so reget time */ 2657 selection_wait = Sel_none;
2545 (void)gettimeofday(&(R->h->timeout[TIMEOUT_INCR]), NULL); 2658 incr_ev.stop ();
2546 R->h->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */
2547 } 2659 }
2548} 2660}
2661
2549/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2550/* 2663/*
2551 * Request the current selection: 2664 * Request the current selection:
2552 * Order: > internal selection if available 2665 * Order: > internal selection if available
2553 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2666 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2554 * > CUT_BUFFER0 2667 * > CUT_BUFFER0
2555 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2668 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2556 * will auto fallback to CUT_BUFFER0 2669 * will auto fallback to CUT_BUFFER0
2557 * EXT: button 2 release 2670 * EXT: button 2 release
2558 */ 2671 */
2559/* EXTPROTO */
2560void 2672void
2561rxvt_selection_request(pR_ Time tm, int x, int y) 2673rxvt_term::selection_request (Time tm, int x, int y)
2562{ 2674{
2563 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2675 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2676
2564 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2677 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2565 return; /* outside window */ 2678 return; /* outside window */
2566 2679
2567 if (R->selection.text != NULL) { /* internal selection */ 2680 if (selection.text)
2681 { /* internal selection */
2568 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2569 rxvt_PasteIt(aR_ R->selection.text, R->selection.len); 2683 char *str = rxvt_wcstombs (selection.text, selection.len);
2570 return; 2684 paste ((unsigned char *)str, strlen (str));
2571 } else { 2685 free (str);
2572 int i; 2686 return;
2687 }
2688 else
2689 {
2690 int i;
2573 2691
2574 R->h->selection_request_time = tm; 2692 selection_request_time = tm;
2575 R->h->selection_wait = Sel_normal; 2693 selection_wait = Sel_normal;
2694
2576 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2695 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2577#ifdef MULTICHAR_SET 2696 {
2578 R->h->selection_type = Sel_CompoundText; 2697#if X_HAVE_UTF8_STRING
2698 selection_type = Sel_UTF8String;
2699 if (selection_request_other (xa[XA_UTF8_STRING], i))
2700 return;
2579#else 2701#else
2580 R->h->selection_type = 0; 2702 selection_type = Sel_CompoundText;
2703 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2704 return;
2581#endif 2705#endif
2582 if (rxvt_selection_request_other(aR_ 2706
2583#ifdef MULTICHAR_SET 2707 }
2584 R->h->xa[XA_COMPOUND_TEXT],
2585#else
2586 XA_STRING,
2587#endif
2588 i))
2589 return;
2590 }
2591 } 2708 }
2709
2592 R->h->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2593 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2711 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2594 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2712 selection_paste (display->root, XA_CUT_BUFFER0, False);
2595} 2713}
2596 2714
2597/* INTPROTO */
2598int 2715int
2599rxvt_selection_request_other(pR_ Atom target, int selnum) 2716rxvt_term::selection_request_other (Atom target, int selnum)
2600{ 2717{
2601 Atom sel; 2718 Atom sel;
2602#ifdef DEBUG_SELECT 2719#ifdef DEBUG_SELECT
2603 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2720 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2604#endif 2721#endif
2605 2722
2606 R->h->selection_type |= selnum; 2723 selection_type |= selnum;
2724
2607 if (selnum == Sel_Primary) 2725 if (selnum == Sel_Primary)
2608 sel = XA_PRIMARY; 2726 sel = XA_PRIMARY;
2609 else if (selnum == Sel_Secondary) 2727 else if (selnum == Sel_Secondary)
2610 sel = XA_SECONDARY; 2728 sel = XA_SECONDARY;
2611 else 2729 else
2612 sel = R->h->xa[XA_CLIPBOARD]; 2730 sel = xa[XA_CLIPBOARD];
2731
2613 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2732 if (XGetSelectionOwner (display->display, sel) != None)
2733 {
2614 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2734 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2615 XConvertSelection(R->Xdisplay, sel, target, R->h->xa[XA_VT_SELECTION], 2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2616 R->TermWin.vt, R->h->selection_request_time); 2736 TermWin.vt, selection_request_time);
2617 return 1; 2737 return 1;
2618 } 2738 }
2739
2619 return 0; 2740 return 0;
2620} 2741}
2621 2742
2622/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2623/* 2744/*
2624 * Clear all selected text 2745 * Clear all selected text
2625 * EXT: SelectionClear 2746 * EXT: SelectionClear
2626 */ 2747 */
2627/* EXTPROTO */
2628void 2748void
2629rxvt_selection_clear(pR) 2749rxvt_term::selection_clear ()
2630{ 2750{
2631 D_SELECT((stderr, "rxvt_selection_clear()")); 2751 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2632 2752
2633 R->h->want_refresh = 1; 2753 want_refresh = 1;
2634 if (R->selection.text)
2635 free(R->selection.text); 2754 free (selection.text);
2636 R->selection.text = NULL; 2755 selection.text = NULL;
2637 R->selection.len = 0; 2756 selection.len = 0;
2638 CLEAR_SELECTION(R); 2757 CLEAR_SELECTION ();
2758
2759 if (display->selection_owner == this)
2760 display->selection_owner = 0;
2639} 2761}
2640 2762
2641/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2642/* 2764/*
2643 * Copy a selection into the cut buffer 2765 * Copy a selection into the cut buffer
2644 * EXT: button 1 or 3 release 2766 * EXT: button 1 or 3 release
2645 */ 2767 */
2646/* EXTPROTO */
2647void 2768void
2648rxvt_selection_make(pR_ Time tm) 2769rxvt_term::selection_make (Time tm)
2649{ 2770{
2650 int i, col, end_col, row, end_row; 2771 int i, col, end_col, row, end_row;
2651 unsigned char *new_selection_text; 2772 wchar_t *new_selection_text;
2652 char *str; 2773 text_t *t;
2653 text_t *t;
2654#ifdef ACS_ASCII
2655 rend_t *re;
2656#endif
2657 2774
2658 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks)); 2775 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2659 switch (R->selection.op) { 2776 switch (selection.op)
2777 {
2660 case SELECTION_CONT: 2778 case SELECTION_CONT:
2661 break; 2779 break;
2662 case SELECTION_INIT: 2780 case SELECTION_INIT:
2663 CLEAR_SELECTION(R); 2781 CLEAR_SELECTION ();
2664 /* FALLTHROUGH */ 2782 /* FALLTHROUGH */
2665 case SELECTION_BEGIN: 2783 case SELECTION_BEGIN:
2666 R->selection.op = SELECTION_DONE; 2784 selection.op = SELECTION_DONE;
2667 /* FALLTHROUGH */ 2785 /* FALLTHROUGH */
2668 default: 2786 default:
2669 return; 2787 return;
2670 } 2788 }
2789
2671 R->selection.op = SELECTION_DONE; 2790 selection.op = SELECTION_DONE;
2672 2791
2673 if (R->selection.clicks == 4) 2792 if (selection.clicks == 4)
2674 return; /* nothing selected, go away */ 2793 return; /* nothing selected, go away */
2675 2794
2676 i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; 2795 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2677 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2796 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2678 2797
2679 new_selection_text = (unsigned char *)str;
2680
2681 col = R->selection.beg.col; 2798 col = selection.beg.col;
2682 MAX_IT(col, 0); 2799 MAX_IT (col, 0);
2683 row = R->selection.beg.row + R->TermWin.saveLines; 2800 row = selection.beg.row + TermWin.saveLines;
2684 end_row = R->selection.end.row + R->TermWin.saveLines; 2801 end_row = selection.end.row + TermWin.saveLines;
2802 int ofs = 0;
2803 int extra = 0;
2685 2804
2686 for (; row <= end_row; row++, col = 0) 2805 for (; row <= end_row; row++, col = 0)
2687 { 2806 {
2688 t = &(R->screen.text[row][col]); 2807 t = &(screen.text[row][col]);
2689 2808
2690 end_col = R->screen.tlen[row]; 2809 end_col = screen.tlen[row];
2691 2810
2692 if (end_col == -1) 2811 if (end_col == -1)
2693 end_col = R->TermWin.ncol; 2812 end_col = TermWin.ncol;
2694 2813
2695 if (row == end_row) 2814 if (row == end_row)
2696 MIN_IT (end_col, R->selection.end.col); 2815 MIN_IT (end_col, selection.end.col);
2697 2816
2698 for (; col < end_col; col++) 2817 for (; col < end_col; col++)
2818 {
2699 if (*t == NOCHAR) 2819 if (*t == NOCHAR)
2700 t++; 2820 t++;
2821#if ENABLE_COMBINING
2822 else if (IS_COMPOSE (*t))
2823 {
2824 int len = rxvt_composite.expand (*t, 0);
2825
2826 extra -= (len - 1);
2827
2828 if (extra < 0)
2829 {
2830 extra += i;
2831 i += i;
2832 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2833 }
2834
2835 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2836 }
2837#endif
2701 else 2838 else
2702 { 2839 new_selection_text[ofs++] = *t++;
2703 int len = wctomb (str, *t++);
2704 if (len > 0)
2705 str += len;
2706 } 2840 }
2707 2841
2708 if (R->screen.tlen[row] != -1 && row != end_row) 2842 if (screen.tlen[row] != -1 && row != end_row)
2709 *str++ = '\n'; 2843 new_selection_text[ofs++] = C0_LF;
2710 } 2844 }
2711 2845
2712#ifndef NO_OLD_SELECTION
2713 if (R->selection_style == OLD_SELECT)
2714 if (end_col == R->TermWin.ncol)
2715 *str++ = '\n';
2716#endif
2717#ifndef NO_NEW_SELECTION
2718 if (R->selection_style != OLD_SELECT)
2719 if (end_col != R->selection.end.col) 2846 if (end_col != selection.end.col)
2720 *str++ = '\n'; 2847 new_selection_text[ofs++] = C0_LF;
2721#endif
2722 *str = '\0';
2723 2848
2724 i = str - (char *)new_selection_text; 2849 new_selection_text[ofs] = 0;
2850
2725 if (i == 0) 2851 if (ofs == 0)
2726 { 2852 {
2727 free (new_selection_text); 2853 free (new_selection_text);
2728 return; 2854 return;
2729 } 2855 }
2730 2856
2731 // due to MB_MAX_CUR, selection wastage is usually high
2732 if (str - (char *)new_selection_text > 1024)
2733 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2734
2735 R->selection.len = i;
2736 if (R->selection.text)
2737 free (R->selection.text); 2857 free (selection.text);
2738 2858
2739 R->selection.text = new_selection_text; 2859 // we usually allocate much more than necessary, so realloc it smaller again
2860 selection.len = ofs;
2861 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2740 2862
2741 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 2863 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2742 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 2864 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2743 rxvt_print_error("can't get primary selection"); 2865 display->set_selection_owner (this);
2866 else
2867 rxvt_warn ("can't get primary selection, ignoring.\n");
2868
2869#if 0
2870 XTextProperty ct;
2871
2872 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2873 {
2744 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2874 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2745 PropModeReplace, R->selection.text, (int)R->selection.len); 2875 PropModeReplace, ct.value, ct.nitems);
2876 XFree (ct.value);
2877 }
2878#endif
2879
2746 R->h->selection_time = tm; 2880 selection_time = tm;
2747 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); 2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2748} 2882}
2749 2883
2750/* ------------------------------------------------------------------------- */ 2884/* ------------------------------------------------------------------------- */
2751/* 2885/*
2752 * Mark or select text based upon number of clicks: 1, 2, or 3 2886 * Mark or select text based upon number of clicks: 1, 2, or 3
2753 * EXT: button 1 press 2887 * EXT: button 1 press
2754 */ 2888 */
2755/* EXTPROTO */
2756void 2889void
2757rxvt_selection_click(pR_ int clicks, int x, int y) 2890rxvt_term::selection_click (int clicks, int x, int y)
2758{ 2891{
2759 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); 2892 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2760 2893
2761 clicks = ((clicks - 1) % 3) + 1; 2894 clicks = ((clicks - 1) % 3) + 1;
2762 R->selection.clicks = clicks; /* save clicks so extend will work */ 2895 selection.clicks = clicks; /* save clicks so extend will work */
2763 2896
2764 rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); 2897 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2898
2765 if (clicks == 2 || clicks == 3) 2899 if (clicks == 2 || clicks == 3)
2766 rxvt_selection_extend_colrow(aR_ R->selection.mark.col, 2900 selection_extend_colrow (selection.mark.col,
2767 R->selection.mark.row 2901 selection.mark.row + TermWin.view_start,
2768 + R->TermWin.view_start, 2902 0, /* button 3 */
2769 0, /* button 3 */ 2903 1, /* button press */
2770 1, /* button press */ 2904 0); /* click change */
2771 0); /* click change */
2772} 2905}
2773 2906
2774/* ------------------------------------------------------------------------- */ 2907/* ------------------------------------------------------------------------- */
2775/* 2908/*
2776 * Mark a selection at the specified col/row 2909 * Mark a selection at the specified col/row
2777 */ 2910 */
2778/* INTPROTO */
2779void 2911void
2780rxvt_selection_start_colrow(pR_ int col, int row) 2912rxvt_term::selection_start_colrow (int col, int row)
2781{ 2913{
2782 R->h->want_refresh = 1; 2914 want_refresh = 1;
2783 R->selection.mark.col = col; 2915 selection.mark.col = col;
2784 R->selection.mark.row = row - R->TermWin.view_start; 2916 selection.mark.row = row - TermWin.view_start;
2917
2785 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 2918 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2786 MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); 2919 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2787 MAX_IT(R->selection.mark.col, 0); 2920 MAX_IT (selection.mark.col, 0);
2788 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 2921 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2789 2922
2790 if (R->selection.op) { /* clear the old selection */ 2923 while (selection.mark.col > 0
2924 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2925 --selection.mark.col;
2926
2927 if (selection.op)
2928 { /* clear the old selection */
2791 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 2929 selection.beg.row = selection.end.row = selection.mark.row;
2792 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 2930 selection.beg.col = selection.end.col = selection.mark.col;
2793 } 2931 }
2932
2794 R->selection.op = SELECTION_INIT; 2933 selection.op = SELECTION_INIT;
2795 R->selection.screen = R->h->current_screen; 2934 selection.screen = current_screen;
2796} 2935}
2797 2936
2798/* ------------------------------------------------------------------------- */ 2937/* ------------------------------------------------------------------------- */
2799/* 2938/*
2800 * Word select: select text for 2 clicks 2939 * Word select: select text for 2 clicks
2801 * We now only find out the boundary in one direction 2940 * We now only find out the boundary in one direction
2802 */ 2941 */
2803 2942
2804/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2943/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2805#define DELIMIT_TEXT(x) \ 2944#define DELIMIT_TEXT(x) \
2806 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->h->rs[Rs_cutchars], (x)) != NULL)) 2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2807#ifdef MULTICHAR_SET
2808# define DELIMIT_REND(x) (((x) & RS_multiMask) ? 1 : 0)
2809#else
2810# define DELIMIT_REND(x) 1 2946#define DELIMIT_REND(x) 1
2811#endif
2812 2947
2813/* INTPROTO */
2814void 2948void
2815rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2949rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2816{ 2950{
2817 int col, row, dirnadd, tcol, trow, w1, w2; 2951 int col, row, dirnadd, tcol, trow, w1, w2;
2818 row_col_t bound; 2952 row_col_t bound;
2819 text_t *stp; 2953 text_t *stp;
2820 rend_t *srp; 2954 rend_t *srp;
2821 2955
2822 if (dirn == UP) { 2956 if (dirn == UP)
2957 {
2823 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; 2958 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2824 bound.col = 0; 2959 bound.col = 0;
2825 dirnadd = -1; 2960 dirnadd = -1;
2826 } else { 2961 }
2962 else
2963 {
2827 bound.row = R->TermWin.saveLines + R->TermWin.nrow; 2964 bound.row = TermWin.saveLines + TermWin.nrow;
2828 bound.col = R->TermWin.ncol - 1; 2965 bound.col = TermWin.ncol - 1;
2829 dirnadd = 1; 2966 dirnadd = 1;
2830 } 2967 }
2968
2831 row = mark->row + R->TermWin.saveLines; 2969 row = mark->row + TermWin.saveLines;
2832 col = mark->col; 2970 col = mark->col;
2833 MAX_IT(col, 0); 2971 MAX_IT (col, 0);
2834/* find the edge of a word */ 2972 /* find the edge of a word */
2835 stp = &(R->screen.text[row][col]); 2973 stp = & (screen.text[row][col]);
2836 w1 = DELIMIT_TEXT(*stp); 2974 w1 = DELIMIT_TEXT (*stp);
2837 2975
2838 if (R->selection_style != NEW_SELECT) {
2839 if (w1 == 1) {
2840 stp += dirnadd;
2841 if (DELIMIT_TEXT(*stp) == 1)
2842 goto Old_Word_Selection_You_Die;
2843 col += dirnadd;
2844 }
2845 w1 = 0;
2846 }
2847 srp = (&R->screen.rend[row][col]); 2976 srp = (&screen.rend[row][col]);
2848 w2 = DELIMIT_REND(*srp); 2977 w2 = DELIMIT_REND (*srp);
2849 2978
2850 for (;;) { 2979 for (;;)
2980 {
2851 for (; col != bound.col; col += dirnadd) { 2981 for (; col != bound.col; col += dirnadd)
2982 {
2852 stp += dirnadd; 2983 stp += dirnadd;
2984 srp += dirnadd;
2985
2986 if (*stp == NOCHAR)
2987 continue;
2988
2853 if (DELIMIT_TEXT(*stp) != w1) 2989 if (DELIMIT_TEXT (*stp) != w1)
2854 break; 2990 break;
2855 srp += dirnadd;
2856 if (DELIMIT_REND(*srp) != w2) 2991 if (DELIMIT_REND (*srp) != w2)
2857 break; 2992 break;
2858 } 2993 }
2994
2859 if ((col == bound.col) && (row != bound.row)) { 2995 if ((col == bound.col) && (row != bound.row))
2996 {
2860 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) { 2997 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2861 trow = row + dirnadd; 2998 {
2999 trow = row + dirnadd;
2862 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0; 3000 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3001
2863 if (R->screen.text[trow] == NULL) 3002 if (screen.text[trow] == NULL)
2864 break; 3003 break;
3004
2865 stp = &(R->screen.text[trow][tcol]); 3005 stp = & (screen.text[trow][tcol]);
2866 srp = &(R->screen.rend[trow][tcol]); 3006 srp = & (screen.rend[trow][tcol]);
3007
2867 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) 3008 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3009 break;
3010
3011 row = trow;
3012 col = tcol;
3013 continue;
3014 }
3015 }
2868 break; 3016 break;
2869 row = trow;
2870 col = tcol;
2871 continue;
2872 } 3017 }
2873 } 3018
2874 break;
2875 }
2876 Old_Word_Selection_You_Die: 3019Old_Word_Selection_You_Die:
2877 D_SELECT((stderr, "rxvt_selection_delimit_word(%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - R->TermWin.saveLines, col)); 3020 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2878 3021
2879 if (dirn == DN) 3022 if (dirn == DN)
2880 col++; /* put us on one past the end */ 3023 col++; /* put us on one past the end */
2881 3024
2882/* Poke the values back in */ 3025 /* Poke the values back in */
2883 ret->row = row - R->TermWin.saveLines; 3026 ret->row = row - TermWin.saveLines;
2884 ret->col = col; 3027 ret->col = col;
2885} 3028}
2886 3029
2887/* ------------------------------------------------------------------------- */ 3030/* ------------------------------------------------------------------------- */
2888/* 3031/*
2889 * Extend the selection to the specified x/y pixel location 3032 * Extend the selection to the specified x/y pixel location
2890 * EXT: button 3 press; button 1 or 3 drag 3033 * EXT: button 3 press; button 1 or 3 drag
2891 * flag == 0 ==> button 1 3034 * flag == 0 ==> button 1
2892 * flag == 1 ==> button 3 press 3035 * flag == 1 ==> button 3 press
2893 * flag == 2 ==> button 3 motion 3036 * flag == 2 ==> button 3 motion
2894 */ 3037 */
2895/* EXTPROTO */
2896void 3038void
2897rxvt_selection_extend(pR_ int x, int y, int flag) 3039rxvt_term::selection_extend (int x, int y, int flag)
2898{ 3040{
2899 int col, row; 3041 int col, row;
2900 3042
2901 col = Pixel2Col(x); 3043 col = Pixel2Col (x);
2902 row = Pixel2Row(y); 3044 row = Pixel2Row (y);
2903 MAX_IT(row, 0); 3045 MAX_IT (row, 0);
2904 MIN_IT(row, (int)R->TermWin.nrow - 1); 3046 MIN_IT (row, (int)TermWin.nrow - 1);
2905 MAX_IT(col, 0); 3047 MAX_IT (col, 0);
2906 MIN_IT(col, (int)R->TermWin.ncol); 3048 MIN_IT (col, (int)TermWin.ncol);
2907#ifndef NO_NEW_SELECTION 3049
2908/* 3050 /*
2909 * If we're selecting characters (single click) then we must check first 3051 * If we're selecting characters (single click) then we must check first
2910 * if we are at the same place as the original mark. If we are then 3052 * if we are at the same place as the original mark. If we are then
2911 * select nothing. Otherwise, if we're to the right of the mark, you have to 3053 * select nothing. Otherwise, if we're to the right of the mark, you have to
2912 * be _past_ a character for it to be selected. 3054 * be _past_ a character for it to be selected.
2913 */ 3055 */
2914 if (R->selection_style != OLD_SELECT) {
2915 if (((R->selection.clicks % 3) == 1) && !flag 3056 if (((selection.clicks % 3) == 1) && !flag
2916 && (col == R->selection.mark.col 3057 && (col == selection.mark.col
2917 && (row == R->selection.mark.row + R->TermWin.view_start))) { 3058 && (row == selection.mark.row + TermWin.view_start)))
3059 {
2918 /* select nothing */ 3060 /* select nothing */
2919 R->selection.beg.row = R->selection.end.row = 0; 3061 selection.beg.row = selection.end.row = 0;
2920 R->selection.beg.col = R->selection.end.col = 0; 3062 selection.beg.col = selection.end.col = 0;
2921 R->selection.clicks = 4; 3063 selection.clicks = 4;
2922 R->h->want_refresh = 1; 3064 want_refresh = 1;
2923 D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); 3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
2924 return; 3066 return;
2925 }
2926 } 3067 }
2927#endif 3068
2928 if (R->selection.clicks == 4) 3069 if (selection.clicks == 4)
2929 R->selection.clicks = 1; 3070 selection.clicks = 1;
3071
2930 rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ 3072 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2931 flag == 1 ? 1 : 0, /* ? button press */ 3073 flag == 1 ? 1 : 0, /* ? button press */
2932 0); /* no click change */ 3074 0); /* no click change */
2933} 3075}
2934 3076
2935/* ------------------------------------------------------------------------- */ 3077/* ------------------------------------------------------------------------- */
2936/* 3078/*
2937 * Extend the selection to the specified col/row 3079 * Extend the selection to the specified col/row
2938 */ 3080 */
2939/* INTPROTO */
2940void 3081void
2941rxvt_selection_extend_colrow(pR_ int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3082rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
2942{ 3083{
2943 int16_t ncol = R->TermWin.ncol; 3084 int16_t ncol = TermWin.ncol;
2944 int end_col; 3085 int end_col;
2945 row_col_t pos; 3086 row_col_t pos;
2946 enum { 3087 enum {
2947 LEFT, RIGHT 3088 LEFT, RIGHT
2948 } closeto = RIGHT; 3089 } closeto = RIGHT;
2949 3090
2950 D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, R->selection.clicks, R->selection.op)); 3091 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
2951 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3092 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
2952 3093
2953 R->h->want_refresh = 1; 3094 want_refresh = 1;
2954 switch (R->selection.op) { 3095 switch (selection.op)
3096 {
2955 case SELECTION_INIT: 3097 case SELECTION_INIT:
2956 CLEAR_SELECTION(R); 3098 CLEAR_SELECTION ();
2957 R->selection.op = SELECTION_BEGIN; 3099 selection.op = SELECTION_BEGIN;
2958 /* FALLTHROUGH */ 3100 /* FALLTHROUGH */
2959 case SELECTION_BEGIN: 3101 case SELECTION_BEGIN:
2960 if (row != R->selection.mark.row || col != R->selection.mark.col 3102 if (row != selection.mark.row || col != selection.mark.col
2961 || (!button3 && buttonpress)) 3103 || (!button3 && buttonpress))
2962 R->selection.op = SELECTION_CONT; 3104 selection.op = SELECTION_CONT;
2963 break; 3105 break;
2964 case SELECTION_DONE: 3106 case SELECTION_DONE:
2965 R->selection.op = SELECTION_CONT; 3107 selection.op = SELECTION_CONT;
2966 /* FALLTHROUGH */ 3108 /* FALLTHROUGH */
2967 case SELECTION_CONT: 3109 case SELECTION_CONT:
2968 break; 3110 break;
2969 case SELECTION_CLEAR: 3111 case SELECTION_CLEAR:
2970 rxvt_selection_start_colrow(aR_ col, row); 3112 selection_start_colrow (col, row);
2971 /* FALLTHROUGH */ 3113 /* FALLTHROUGH */
2972 default: 3114 default:
2973 return; 3115 return;
2974 } 3116 }
2975 if (R->selection.beg.col == R->selection.end.col 3117 if (selection.beg.col == selection.end.col
2976 && R->selection.beg.col != R->selection.mark.col 3118 && selection.beg.col != selection.mark.col
2977 && R->selection.beg.row == R->selection.end.row 3119 && selection.beg.row == selection.end.row
2978 && R->selection.beg.row != R->selection.mark.row) { 3120 && selection.beg.row != selection.mark.row)
3121 {
2979 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3122 selection.beg.col = selection.end.col = selection.mark.col;
2980 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3123 selection.beg.row = selection.end.row = selection.mark.row;
2981 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3124 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
2982 } 3125 }
2983 3126
2984 pos.col = col; 3127 pos.col = col;
2985 pos.row = row; 3128 pos.row = row;
2986 3129
2987 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3130 pos.row -= TermWin.view_start; /* adjust for scroll */
2988 3131
2989#ifndef NO_OLD_SELECTION 3132 /*
2990/*
2991 * This mimics some of the selection behaviour of version 2.20 and before.
2992 * There are no ``selection modes'', button3 is always character extension.
2993 * Note: button3 drag is always available, c.f. v2.20
2994 * Selection always terminates (left or right as appropriate) at the mark.
2995 */
2996 if (R->selection_style == OLD_SELECT) {
2997 if (R->selection.clicks == 1 || button3) {
2998 if (R->h->hate_those_clicks) {
2999 R->h->hate_those_clicks = 0;
3000 if (R->selection.clicks == 1) {
3001 R->selection.beg.row = R->selection.mark.row;
3002 R->selection.beg.col = R->selection.mark.col;
3003 } else {
3004 R->selection.mark.row = R->selection.beg.row;
3005 R->selection.mark.col = R->selection.beg.col;
3006 }
3007 }
3008 if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) {
3009 R->selection.end.row = R->selection.mark.row;
3010 R->selection.end.col = R->selection.mark.col + 1;
3011 R->selection.beg.row = pos.row;
3012 R->selection.beg.col = pos.col;
3013 } else {
3014 R->selection.beg.row = R->selection.mark.row;
3015 R->selection.beg.col = R->selection.mark.col;
3016 R->selection.end.row = pos.row;
3017 R->selection.end.col = pos.col + 1;
3018 }
3019 } else if (R->selection.clicks == 2) {
3020 rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark),
3021 &(R->selection.beg));
3022 rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark),
3023 &(R->selection.end));
3024 R->h->hate_those_clicks = 1;
3025 } else if (R->selection.clicks == 3) {
3026 R->selection.beg.row = R->selection.end.row = R->selection.mark.row;
3027 R->selection.beg.col = 0;
3028 R->selection.end.col = ncol;
3029 R->h->hate_those_clicks = 1;
3030 }
3031 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col));
3032 return;
3033 }
3034#endif /* ! NO_OLD_SELECTION */
3035#ifndef NO_NEW_SELECTION
3036/* selection_style must not be OLD_SELECT to get here */
3037/*
3038 * This is mainly xterm style selection with a couple of differences, mainly 3133 * This is mainly xterm style selection with a couple of differences, mainly
3039 * in the way button3 drag extension works. 3134 * in the way button3 drag extension works.
3040 * We're either doing: button1 drag; button3 press; or button3 drag 3135 * We're either doing: button1 drag; button3 press; or button3 drag
3041 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3136 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3042 * is always at the left/right edge of the R->selection. 3137 * is always at the left/right edge of the selection.
3043 * b) button3 press: extend/contract character/word/line at whichever edge of 3138 * b) button3 press: extend/contract character/word/line at whichever edge of
3044 * the selection we are closest to. 3139 * the selection we are closest to.
3045 * c) button3 drag : extend/contract character/word/line - we select around 3140 * c) button3 drag : extend/contract character/word/line - we select around
3046 * a point/word/line which is either the start or end of the selection 3141 * a point/word/line which is either the start or end of the selection
3047 * and it was decided by whichever point/word/line was `fixed' at the 3142 * and it was decided by whichever point/word/line was `fixed' at the
3048 * time of the most recent button3 press 3143 * time of the most recent button3 press
3049 */ 3144 */
3050 if (button3 && buttonpress) { /* button3 press */ 3145 if (button3 && buttonpress)
3051 /* 3146 { /* button3 press */
3147 /*
3052 * first determine which edge of the selection we are closest to 3148 * first determine which edge of the selection we are closest to
3053 */ 3149 */
3054 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3150 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3055 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3151 || (!ROWCOL_IS_AFTER (pos, selection.end)
3056 && (((pos.col - R->selection.beg.col) 3152 && (((pos.col - selection.beg.col)
3057 + ((pos.row - R->selection.beg.row) * ncol)) 3153 + ((pos.row - selection.beg.row) * ncol))
3058 < ((R->selection.end.col - pos.col) 3154 < ((selection.end.col - pos.col)
3059 + ((R->selection.end.row - pos.row) * ncol))))) 3155 + ((selection.end.row - pos.row) * ncol)))))
3060 closeto = LEFT; 3156 closeto = LEFT;
3157
3061 if (closeto == LEFT) { 3158 if (closeto == LEFT)
3159 {
3062 R->selection.beg.row = pos.row; 3160 selection.beg.row = pos.row;
3063 R->selection.beg.col = pos.col; 3161 selection.beg.col = pos.col;
3064 R->selection.mark.row = R->selection.end.row; 3162 selection.mark.row = selection.end.row;
3065 R->selection.mark.col = R->selection.end.col 3163 selection.mark.col = selection.end.col - (selection.clicks == 2);
3066 - (R->selection.clicks == 2); 3164 }
3067 } else { 3165 else
3166 {
3068 R->selection.end.row = pos.row; 3167 selection.end.row = pos.row;
3069 R->selection.end.col = pos.col; 3168 selection.end.col = pos.col;
3070 R->selection.mark.row = R->selection.beg.row; 3169 selection.mark.row = selection.beg.row;
3071 R->selection.mark.col = R->selection.beg.col; 3170 selection.mark.col = selection.beg.col;
3072 } 3171 }
3172 }
3173 else
3073 } else { /* button1 drag or button3 drag */ 3174 { /* button1 drag or button3 drag */
3074 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) { 3175 if (ROWCOL_IS_AFTER (selection.mark, pos))
3176 {
3075 if ((R->selection.mark.row == R->selection.end.row) 3177 if ((selection.mark.row == selection.end.row)
3076 && (R->selection.mark.col == R->selection.end.col) 3178 && (selection.mark.col == selection.end.col)
3077 && clickchange && R->selection.clicks == 2) 3179 && clickchange && selection.clicks == 2)
3078 R->selection.mark.col--; 3180 selection.mark.col--;
3181
3079 R->selection.beg.row = pos.row; 3182 selection.beg.row = pos.row;
3080 R->selection.beg.col = pos.col; 3183 selection.beg.col = pos.col;
3081 R->selection.end.row = R->selection.mark.row; 3184 selection.end.row = selection.mark.row;
3082 R->selection.end.col = R->selection.mark.col 3185 selection.end.col = selection.mark.col + (selection.clicks == 2);
3083 + (R->selection.clicks == 2); 3186 }
3084 } else { 3187 else
3188 {
3085 R->selection.beg.row = R->selection.mark.row; 3189 selection.beg.row = selection.mark.row;
3086 R->selection.beg.col = R->selection.mark.col; 3190 selection.beg.col = selection.mark.col;
3087 R->selection.end.row = pos.row; 3191 selection.end.row = pos.row;
3088 R->selection.end.col = pos.col; 3192 selection.end.col = pos.col;
3089 } 3193 }
3090 } 3194 }
3091 3195
3092 if (R->selection.clicks == 1) { 3196 if (selection.clicks == 1)
3197 {
3093 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines]; 3198 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3199
3094 if (end_col != -1 && R->selection.beg.col > end_col) { 3200 if (end_col != -1 && selection.beg.col > end_col)
3201 {
3095#if 1 3202#if 1
3096 R->selection.beg.col = ncol; 3203 selection.beg.col = ncol;
3097#else 3204#else
3098 if (R->selection.beg.row != R->selection.end.row) 3205 if (selection.beg.row != selection.end.row)
3099 R->selection.beg.col = ncol; 3206 selection.beg.col = ncol;
3100 else 3207 else
3101 R->selection.beg.col = R->selection.mark.col; 3208 selection.beg.col = selection.mark.col;
3102#endif 3209#endif
3103 } 3210 }
3211
3104 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; 3212 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3213
3105 if (end_col != -1 && R->selection.end.col > end_col) 3214 if (end_col != -1 && selection.end.col > end_col)
3106 R->selection.end.col = ncol; 3215 selection.end.col = ncol;
3107 3216 }
3108 } else if (R->selection.clicks == 2) { 3217 else if (selection.clicks == 2)
3218 {
3109 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg)) 3219 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3110 R->selection.end.col--; 3220 selection.end.col--;
3111 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), 3221
3112 &(R->selection.beg)); 3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3113 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end), 3223 selection_delimit_word (DN, & (selection.end), & (selection.end));
3114 &(R->selection.end)); 3224 }
3115 } else if (R->selection.clicks == 3) { 3225 else if (selection.clicks == 3)
3226 {
3116#ifndef NO_FRILLS 3227#ifndef NO_FRILLS
3117 if ((R->Options & Opt_tripleclickwords)) { 3228 if ((Options & Opt_tripleclickwords))
3118 int end_row; 3229 {
3230 int end_row;
3119 3231
3120 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), 3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3121 &(R->selection.beg)); 3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3122 end_row = R->screen.tlen[R->selection.mark.row 3234
3123 + R->TermWin.saveLines];
3124 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow; 3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3125 end_row++) { 3236 {
3126 end_col = R->screen.tlen[end_row + R->TermWin.saveLines]; 3237 end_col = screen.tlen[end_row + TermWin.saveLines];
3127 if (end_col != -1) { 3238
3128 R->selection.end.row = end_row; 3239 if (end_col != -1)
3129 R->selection.end.col = end_col; 3240 {
3130 rxvt_selection_remove_trailing_spaces(aR); 3241 selection.end.row = end_row;
3131 break; 3242 selection.end.col = end_col;
3132 } 3243 selection_remove_trailing_spaces ();
3244 break;
3245 }
3246 }
3247 }
3248 else
3249#endif
3250 {
3251 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3252 selection.mark.col++;
3253 selection.beg.col = 0;
3254 selection.end.col = ncol;
3255 }
3133 } 3256 }
3134 } else 3257
3135#endif 3258 if (button3 && buttonpress)
3136 { 3259 { /* mark may need to be changed */
3137 if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg))
3138 R->selection.mark.col++;
3139 R->selection.beg.col = 0;
3140 R->selection.end.col = ncol;
3141 }
3142 }
3143 if (button3 && buttonpress) { /* mark may need to be changed */
3144 if (closeto == LEFT) { 3260 if (closeto == LEFT)
3261 {
3145 R->selection.mark.row = R->selection.end.row; 3262 selection.mark.row = selection.end.row;
3146 R->selection.mark.col = R->selection.end.col 3263 selection.mark.col = selection.end.col
3147 - (R->selection.clicks == 2); 3264 - (selection.clicks == 2);
3148 } else { 3265 }
3266 else
3267 {
3149 R->selection.mark.row = R->selection.beg.row; 3268 selection.mark.row = selection.beg.row;
3150 R->selection.mark.col = R->selection.beg.col; 3269 selection.mark.col = selection.beg.col;
3151 } 3270 }
3152 } 3271 }
3153 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3272 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3154#endif /* ! NO_NEW_SELECTION */
3155} 3273}
3156 3274
3157#ifndef NO_FRILLS 3275#ifndef NO_FRILLS
3158/* INTPROTO */
3159void 3276void
3160rxvt_selection_remove_trailing_spaces(pR) 3277rxvt_term::selection_remove_trailing_spaces ()
3161{ 3278{
3162 int32_t end_col, end_row; 3279 int32_t end_col, end_row;
3163 text_t *stp; 3280 text_t *stp;
3164 3281
3165 end_col = R->selection.end.col; 3282 end_col = selection.end.col;
3166 end_row = R->selection.end.row; 3283 end_row = selection.end.row;
3167 for ( ; end_row >= R->selection.beg.row; ) { 3284 for ( ; end_row >= selection.beg.row; )
3285 {
3168 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3286 stp = screen.text[end_row + TermWin.saveLines];
3169 while (--end_col >= 0) { 3287 while (--end_col >= 0)
3288 {
3170 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3289 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3171 break; 3290 break;
3172 } 3291 }
3173 if (end_col >= 0 3292 if (end_col >= 0
3174 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { 3293 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3294 {
3175 R->selection.end.col = end_col + 1; 3295 selection.end.col = end_col + 1;
3176 R->selection.end.row = end_row; 3296 selection.end.row = end_row;
3177 break; 3297 break;
3178 } 3298 }
3179 end_row--; 3299 end_row--;
3180 end_col = R->TermWin.ncol; 3300 end_col = TermWin.ncol;
3181 } 3301 }
3182 if (R->selection.mark.row > R->selection.end.row) { 3302 if (selection.mark.row > selection.end.row)
3303 {
3183 R->selection.mark.row = R->selection.end.row; 3304 selection.mark.row = selection.end.row;
3184 R->selection.mark.col = R->selection.end.col; 3305 selection.mark.col = selection.end.col;
3306 }
3185 } else if (R->selection.mark.row == R->selection.end.row 3307 else if (selection.mark.row == selection.end.row
3186 && R->selection.mark.col > R->selection.end.col) 3308 && selection.mark.col > selection.end.col)
3187 R->selection.mark.col = R->selection.end.col; 3309 selection.mark.col = selection.end.col;
3188} 3310}
3189#endif 3311#endif
3190 3312
3191/* ------------------------------------------------------------------------- */ 3313/* ------------------------------------------------------------------------- */
3192/* 3314/*
3193 * Double click on button 3 when already selected 3315 * Double click on button 3 when already selected
3194 * EXT: button 3 double click 3316 * EXT: button 3 double click
3195 */ 3317 */
3196/* EXTPROTO */
3197void 3318void
3198rxvt_selection_rotate(pR_ int x, int y) 3319rxvt_term::selection_rotate (int x, int y)
3199{ 3320{
3200 R->selection.clicks = R->selection.clicks % 3 + 1; 3321 selection.clicks = selection.clicks % 3 + 1;
3201 rxvt_selection_extend_colrow(aR_ Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3322 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3202} 3323}
3203 3324
3204/* ------------------------------------------------------------------------- */ 3325/* ------------------------------------------------------------------------- */
3205/* 3326/*
3206 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3327 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3207 * that is exactly 32 bits wide, because a format of 64 is not allowed by 3328 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3208 * the X11 protocol. 3329 * the X11 protocol.
3209 */ 3330 */
3210typedef CARD32 Atom32; 3331typedef CARD32 Atom32;
3211 3332
3212/* ------------------------------------------------------------------------- */ 3333/* ------------------------------------------------------------------------- */
3213/* 3334/*
3214 * Respond to a request for our current selection 3335 * Respond to a request for our current selection
3215 * EXT: SelectionRequest 3336 * EXT: SelectionRequest
3216 */ 3337 */
3217/* EXTPROTO */
3218void 3338void
3219rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3339rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3220{ 3340{
3221 XSelectionEvent ev; 3341 XSelectionEvent ev;
3222#ifdef USE_XIM
3223 Atom32 target_list[4];
3224#else
3225 Atom32 target_list[3];
3226#endif
3227 Atom target;
3228 XTextProperty ct; 3342 XTextProperty ct;
3229 XICCEncodingStyle style; 3343 XICCEncodingStyle style;
3230 char *cl[2], dummy[1]; 3344 Atom target;
3231 3345
3232 ev.type = SelectionNotify; 3346 ev.type = SelectionNotify;
3233 ev.property = None; 3347 ev.property = None;
3234 ev.display = rq->display; 3348 ev.display = rq.display;
3235 ev.requestor = rq->requestor; 3349 ev.requestor = rq.requestor;
3236 ev.selection = rq->selection; 3350 ev.selection = rq.selection;
3237 ev.target = rq->target; 3351 ev.target = rq.target;
3238 ev.time = rq->time; 3352 ev.time = rq.time;
3239 3353
3240 if (rq->target == R->h->xa[XA_TARGETS]) { 3354 if (rq.target == xa[XA_TARGETS])
3241 target_list[0] = (Atom32) R->h->xa[XA_TARGETS]; 3355 {
3356 Atom32 target_list[6];
3357 Atom32 *target = target_list;
3358
3359 *target++ = (Atom32) xa[XA_TARGETS];
3360 *target++ = (Atom32) xa[XA_TIMESTAMP];
3242 target_list[1] = (Atom32) XA_STRING; 3361 *target++ = (Atom32) XA_STRING;
3243 target_list[2] = (Atom32) R->h->xa[XA_TEXT]; 3362 *target++ = (Atom32) xa[XA_TEXT];
3244#ifdef USE_XIM
3245 target_list[3] = (Atom32) R->h->xa[XA_COMPOUND_TEXT]; 3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3364#if X_HAVE_UTF8_STRING
3365 *target++ = (Atom32) xa[XA_UTF8_STRING];
3246#endif 3366#endif
3367
3247 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3368 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3248 (8 * sizeof(target_list[0])), PropModeReplace, 3369 (8 * sizeof (target_list[0])), PropModeReplace,
3249 (unsigned char *)target_list, 3370 (unsigned char *)target_list,
3250 (sizeof(target_list) / sizeof(target_list[0]))); 3371 target - target_list);
3251 ev.property = rq->property; 3372 ev.property = rq.property;
3373 }
3374#if TODO // TODO
3252 } else if (rq->target == R->h->xa[XA_MULTIPLE]) { 3375 else if (rq.target == xa[XA_MULTIPLE])
3376 {
3253 /* TODO: Handle MULTIPLE */ 3377 /* TODO: Handle MULTIPLE */
3378 }
3379#endif
3254 } else if (rq->target == R->h->xa[XA_TIMESTAMP] && R->selection.text) { 3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3381 {
3255 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3256 (8 * sizeof(Time)), PropModeReplace, 3383 (8 * sizeof (Time)), PropModeReplace,
3257 (unsigned char *)&R->h->selection_time, 1); 3384 (unsigned char *)&selection_time, 1);
3258 ev.property = rq->property; 3385 ev.property = rq.property;
3386 }
3259 } else if (rq->target == XA_STRING 3387 else if (rq.target == XA_STRING
3388 || rq.target == xa[XA_TEXT]
3260 || rq->target == R->h->xa[XA_COMPOUND_TEXT] 3389 || rq.target == xa[XA_COMPOUND_TEXT]
3261 || rq->target == R->h->xa[XA_TEXT]) { 3390 || rq.target == xa[XA_UTF8_STRING]
3262#ifdef USE_XIM 3391 )
3263 short freect = 0; 3392 {
3264#endif 3393 short freect = 0;
3265 int selectlen; 3394 int selectlen;
3395 wchar_t *cl;
3266 3396
3267#ifdef USE_XIM 3397 target = rq.target;
3398
3268 if (rq->target != XA_STRING) { 3399 if (target == XA_STRING)
3269 target = R->h->xa[XA_COMPOUND_TEXT]; 3400 // we actually don't do XA_STRING, but who cares, as i18n clients
3270 style = (rq->target == R->h->xa[XA_COMPOUND_TEXT]) 3401 // will ask for another format anyways.
3271 ? XCompoundTextStyle : XStdICCTextStyle;
3272 } else
3273#endif
3274 {
3275 target = XA_STRING;
3276 style = XStringStyle; 3402 style = XStringStyle;
3277 } 3403 else if (target == xa[XA_TEXT])
3404 style = XStdICCTextStyle;
3405 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle;
3407#if X_HAVE_UTF8_STRING
3408 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle;
3410#endif
3411 else
3412 {
3413 target = xa[XA_COMPOUND_TEXT];
3414 style = XCompoundTextStyle;
3415 }
3416
3278 if (R->selection.text) { 3417 if (selection.text)
3279 cl[0] = (char *)R->selection.text; 3418 {
3419 cl = selection.text;
3280 selectlen = R->selection.len; 3420 selectlen = selection.len;
3281 } else { 3421 }
3282 cl[0] = dummy; 3422 else
3283 *dummy = '\0'; 3423 {
3424 cl = L"";
3284 selectlen = 0; 3425 selectlen = 0;
3285 } 3426 }
3286#ifdef USE_XIM 3427
3428 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3429 // manually for XUTF8StringStyle.
3287 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3430 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3288 == Success) /* if we failed to convert then send it raw */
3289 freect = 1; 3431 freect = 1;
3290 else 3432 else
3291#endif 3433 {
3292 { 3434 /* if we failed to convert then send it raw */
3293 ct.value = (unsigned char *)cl[0]; 3435 ct.value = (unsigned char *)cl;
3294 ct.nitems = selectlen; 3436 ct.nitems = selectlen;
3295 } 3437 }
3438
3296 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3439 XChangeProperty (display->display, rq.requestor, rq.property,
3297 target, 8, PropModeReplace, 3440 target, 8, PropModeReplace,
3298 ct.value, (int)ct.nitems); 3441 ct.value, (int)ct.nitems);
3299 ev.property = rq->property; 3442 ev.property = rq.property;
3300#ifdef USE_XIM 3443
3301 if (freect) 3444 if (freect)
3302 XFree(ct.value); 3445 XFree (ct.value);
3303#endif
3304 } 3446 }
3447
3305 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3448 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3306} 3449}
3307 3450
3308/* ------------------------------------------------------------------------- * 3451/* ------------------------------------------------------------------------- *
3309 * MOUSE ROUTINES * 3452 * MOUSE ROUTINES *
3310 * ------------------------------------------------------------------------- */ 3453 * ------------------------------------------------------------------------- */
3311 3454
3312/* 3455/*
3313 * return col/row values corresponding to x/y pixel values 3456 * return col/row values corresponding to x/y pixel values
3314 */ 3457 */
3315/* EXTPROTO */
3316void 3458void
3317rxvt_pixel_position(pR_ int *x, int *y) 3459rxvt_term::pixel_position (int *x, int *y)
3318{ 3460{
3319 *x = Pixel2Col(*x); 3461 *x = Pixel2Col (*x);
3320/* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3462 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3321 *y = Pixel2Row(*y); 3463 *y = Pixel2Row (*y);
3322/* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3464 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3323} 3465}
3466
3324/* ------------------------------------------------------------------------- */ 3467/* ------------------------------------------------------------------------- */
3325#ifdef USE_XIM 3468#ifdef USE_XIM
3326/* EXTPROTO */
3327void 3469void
3328rxvt_setPosition(pR_ XPoint *pos) 3470rxvt_term::im_set_position (XPoint *pos)
3329{ 3471{
3330 XWindowAttributes xwa; 3472 XWindowAttributes xwa;
3331 3473
3332 XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); 3474 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3333 pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; 3475 pos->x = Col2Pixel (screen.cur.col) + xwa.x;
3334 pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y 3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3335 - R->TermWin.lineSpace;
3336} 3477}
3478
3337#endif 3479#endif
3338/* ------------------------------------------------------------------------- */
3339
3340/* ------------------------------------------------------------------------- * 3480/* ------------------------------------------------------------------------- */
3341 * DEBUG ROUTINES *
3342 * ------------------------------------------------------------------------- */
3343#if 0
3344/* INTPROTO */
3345void
3346rxvt_debug_colors(void)
3347{
3348 int color;
3349 const char *name[] = {
3350 "fg", "bg",
3351 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3352 };
3353
3354 fprintf(stderr, "Color ( ");
3355 if (R->h->rstyle & RS_RVid)
3356 fprintf(stderr, "rvid ");
3357 if (R->h->rstyle & RS_Bold)
3358 fprintf(stderr, "bold ");
3359 if (R->h->rstyle & RS_Blink)
3360 fprintf(stderr, "blink ");
3361 if (R->h->rstyle & RS_Uline)
3362 fprintf(stderr, "uline ");
3363 fprintf(stderr, "): ");
3364
3365 color = GET_FGCOLOR(R->h->rstyle);
3366#ifndef NO_BRIGHTCOLOR
3367 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3368 color -= (minBrightCOLOR - minCOLOR);
3369 fprintf(stderr, "bright ");
3370 }
3371#endif
3372 fprintf(stderr, "%s on ", name[color]);
3373
3374 color = GET_BGCOLOR(R->h->rstyle);
3375#ifndef NO_BRIGHTCOLOR
3376 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3377 color -= (minBrightCOLOR - minCOLOR);
3378 fprintf(stderr, "bright ");
3379 }
3380#endif
3381 fprintf(stderr, "%s\n", name[color]);
3382}
3383#endif

Diff Legend

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