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.74 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

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