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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC

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

Diff Legend

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