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.21 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

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