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.10 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

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