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.19 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

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