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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.313 by root, Tue Nov 4 14:25:10 2008 UTC

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

Diff Legend

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