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

Diff Legend

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